[CalendarServer-changes] [11183] CalDAVTester/branches/users/gaya/sharedgroupstester-3

source_changes at macosforge.org source_changes at macosforge.org
Tue May 14 17:34:09 PDT 2013


Revision: 11183
          http://trac.calendarserver.org//changeset/11183
Author:   gaya at apple.com
Date:     2013-05-14 17:34:09 -0700 (Tue, 14 May 2013)
Log Message:
-----------
merge in changes from sharedgroupstester-2

Modified Paths:
--------------
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/default-addressbook/3.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-only/2.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-only/3.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/1.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/2.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/3.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/2.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/3.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/5.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/6.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/1.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/3.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/4.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/2.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/3.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/5.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/6.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/aclreports.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/add-member.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/default-addressbook.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/get.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/limits.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/mkcol.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/nonascii.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-addressbooks.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-feature.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-peruser-properties.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-replies.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-unshare.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sync-report.xml

Added Paths:
-----------
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/1.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/10.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/11.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/12.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/13.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/14.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15a.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/16.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/2.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/3.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/4.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/5.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/6.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/7.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/8.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/9.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-groups.xml

Removed Paths:
-------------
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/default-addressbook/4.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/mkcol/2.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/mkcol/3.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/main/
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/1.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/10.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/11.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/12.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/13.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/14.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15a.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/16.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/2.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/3.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/4.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/5.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/6.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/7.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/8.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/9.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/resourceid.xml

Property Changed:
----------------
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/


Property changes on: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV
___________________________________________________________________
Added: svn:mergeinfo
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CardDAV:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CardDAV:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/CardDAV:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/CardDAV:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CardDAV:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466/Resource/CardDAV:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/CardDAV:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/CardDAV:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CardDAV:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/CardDAV:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CardDAV:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CardDAV:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV:11078-11181

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/default-addressbook/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/default-addressbook/3.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/default-addressbook/3.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -2,7 +2,7 @@
 <D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
 <D:set>
 <D:prop>
-<C:default-addressbook-URL><D:href>$addressbookhome1:/adbktest1/</D:href></C:default-addressbook-URL>
+<C:default-addressbook-URL><D:href>$addressbookpath1:/</D:href></C:default-addressbook-URL>
 </D:prop>
 </D:set>
 </D:propertyupdate>

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/default-addressbook/4.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/default-addressbook/4.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/default-addressbook/4.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
-<D:set>
-<D:prop>
-<C:default-addressbook-URL><D:href>$addressbookpath1:/</D:href></C:default-addressbook-URL>
-</D:prop>
-</D:set>
-</D:propertyupdate>

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/mkcol/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/mkcol/2.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/mkcol/2.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:mkcol xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
-<D:set>
-<D:prop>
-<D:resourcetype><D:collection/><C:addressbook/></D:resourcetype>
-<D:getetag>An Address Book</D:getetag>
-<D:displayname>An Address Book</D:displayname>
-<C:addressbook-description xml:lang="en">First CardDAV address book.</C:addressbook-description>
-</D:prop>
-</D:set>
-</D:mkcol>

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/mkcol/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/mkcol/3.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/mkcol/3.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:mkcol xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
-<D:set>
-<D:prop>
-<D:resourcetype><D:collection/><D:displayname/></D:resourcetype>
-</D:prop>
-</D:set>
-</D:mkcol>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-only/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-only/2.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-only/2.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -8,7 +8,7 @@
       <read/>
     </access>
     <hosturl>
-      <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+      <href xmlns='DAV:'>$addressbookpath1:</href>
     </hosturl>
     <organizer>
       <href xmlns='DAV:'>$principaluri1:</href>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-only/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-only/3.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-only/3.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -3,7 +3,7 @@
   <href xmlns='DAV:'>mailto:$email2:</href>
   <invite-accepted/>
   <hosturl>
-    <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+    <href xmlns='DAV:'>$addressbookpath1:</href>
   </hosturl>
   <in-reply-to>$inviteuid:</in-reply-to>
   <summary>The Shared Address Book</summary>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/1.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/1.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/1.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -2,7 +2,7 @@
 <CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
     <CS:set>
         <D:href>$cuaddr2:</D:href>
-        <CS:summary>My Shared Address Book</CS:summary>
+        <CS:summary>My Main Shared Address Book</CS:summary>
         <CS:read-write/>
     </CS:set>
 </CS:share>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/2.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/2.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -8,12 +8,12 @@
       <read-write/>
     </access>
     <hosturl>
-      <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+      <href xmlns='DAV:'>$addressbookpath1:</href>
     </hosturl>
     <organizer>
       <href xmlns='DAV:'>$principaluri1:</href>
       <common-name>User 01</common-name>
     </organizer>
-    <summary>My Shared Address Book</summary>
+    <summary>My Main Shared Address Book</summary>
   </invite-notification>
 </notification>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/3.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/3.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -3,7 +3,7 @@
   <href xmlns='DAV:'>mailto:$email2:</href>
   <invite-accepted/>
   <hosturl>
-    <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+    <href xmlns='DAV:'>$addressbookpath1:</href>
   </hosturl>
   <in-reply-to>$inviteuid:</in-reply-to>
   <summary>The Shared Address Book</summary>

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,12 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+UID:8ec61992-d3f4-45cc-b64a-b683c3ba3eff
+FN:user01
+N:user01;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:A
+ BPerson-1
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:A
+ BPerson-2
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/1.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/1.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/1.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,11 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:Thompson;Default;;;
-FN:Default Thompson
-EMAIL;type=INTERNET;type=WORK;type=pref:lthompson at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-555-555-5555
-item1.ADR;type=WORK;type=pref:;;2 Lag;Elk Forest;California;99999;USA
-item1.X-ABADR:us
-UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/1.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/1.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/1.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/1.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Thompson;Default;;;
+FN:Default Thompson
+EMAIL;type=INTERNET;type=WORK;type=pref:lthompson at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-555-555-5555
+item1.ADR;type=WORK;type=pref:;;2 Lag;Elk Forest;California;99999;USA
+item1.X-ABADR:us
+UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/10.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/10.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/10.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,8 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Apple Inc.//AddressBook 6.1//EN
-UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
-FN:Subsub Group
-N:Subsub Group;;;;
-X-ADDRESSBOOKSERVER-KIND:group
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/10.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/10.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/10.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/10.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,8 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
+FN:Subsub Group
+N:Subsub Group;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/11.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/11.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/11.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,11 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Apple Inc.//AddressBook 6.1//EN
-UID:760d9b28-5a13-4880-b7eb-5769e6688fa3
-FN:Shared Group
-N:Shared Group;;;;
-REV:20120503T194243Z
-X-ADDRESSBOOKSERVER-KIND:group
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:8aa9ed15-5619-44d7-b061-51976dd5a174
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ef5516c6-0efd-4626-98b4-5cd2868f3971
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/11.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/11.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/11.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/11.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6688fa3
+FN:Shared Group
+N:Shared Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:8aa9ed15-5619-44d7-b061-51976dd5a174
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ef5516c6-0efd-4626-98b4-5cd2868f3971
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/12.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/12.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/12.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,9 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Apple Inc.//AddressBook 6.1//EN
-UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
-FN:New Group
-N:New Group;;;;
-X-ADDRESSBOOKSERVER-KIND:group
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/12.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/12.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/12.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/12.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,9 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
+FN:New Group
+N:New Group;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/13.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/13.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/13.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,11 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Apple Inc.//AddressBook 6.1//EN
-UID:8aa9ed15-5619-44d7-b061-51976dd5a174
-FN:Sub Group
-N:Sub Group;;;;
-REV:20120503T194243Z
-X-ADDRESSBOOKSERVER-KIND:group
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/13.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/13.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/13.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/13.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:8aa9ed15-5619-44d7-b061-51976dd5a174
+FN:Sub Group
+N:Sub Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/14.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/14.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/14.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Apple Inc.//AddressBook 6.1//EN
-UID:8aa9ed15-5619-44d7-b061-51976dd5a174
-FN:Sub Group
-N:Sub Group;;;;
-REV:20120503T194243Z
-X-ADDRESSBOOKSERVER-KIND:group
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/14.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/14.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/14.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/14.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:8aa9ed15-5619-44d7-b061-51976dd5a174
+FN:Sub Group
+N:Sub Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/15.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,9 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Apple Inc.//AddressBook 6.1//EN
-UID:8aa9ed15-5619-44d7-b061-51976dd5a174
-FN:Sub Group
-N:Sub Group;;;;
-REV:20120503T194243Z
-X-ADDRESSBOOKSERVER-KIND:group
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/15.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,9 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:8aa9ed15-5619-44d7-b061-51976dd5a174
+FN:Sub Group
+N:Sub Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15a.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/15a.xml	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15a.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,6 +0,0 @@
-<?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>

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15a.xml (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/15a.xml)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15a.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/15a.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -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>

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/16.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/16.xml	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/16.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-notification shared-type='group'>
-    <uid></uid>
-    <href xmlns='DAV:'>$cuaddrurn2:</href>
-    <invite-deleted/>
-    <access>
-      <read-write/>
-    </access>
-    <hosturl>
-      <href xmlns='DAV:'>$addressbookpath1:/3.vcf</href>
-    </hosturl>
-    <organizer>
-      <href xmlns='DAV:'>$principaluri1:</href>
-      <common-name>User 01</common-name>
-    </organizer>
-    <summary>Group Address Book</summary>
-  </invite-notification>
-</notification>

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/16.xml (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/16.xml)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/16.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/16.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='group'>
+    <uid></uid>
+    <href xmlns='DAV:'>$cuaddrurn2:</href>
+    <invite-deleted/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>$addressbookpath1:/3.vcf</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>$principaluri1:</href>
+      <common-name>User 01</common-name>
+    </organizer>
+    <summary>Group Address Book</summary>
+  </invite-notification>
+</notification>

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/2.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/2.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/2.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,12 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:Kawado;Saeko;;;
-FN:Snow Leopard
-ORG:Snow Leopard;
-EMAIL;type=INTERNET;type=WORK;type=pref:snowleopard_apple at example.com
-TEL;type=WORK;type=pref:555-555-5555
-item1.ADR;type=WORK;type=pref:;;2 Fidel Ave. Suite 1;Mountain Top;CA;99999;USA
-item1.X-ABADR:us
-X-ABShowAs:COMPANY
-UID:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/2.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/2.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/2.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/2.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,12 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Kawado;Saeko;;;
+FN:Snow Leopard
+ORG:Snow Leopard;
+EMAIL;type=INTERNET;type=WORK;type=pref:snowleopard_apple at example.com
+TEL;type=WORK;type=pref:555-555-5555
+item1.ADR;type=WORK;type=pref:;;2 Fidel Ave. Suite 1;Mountain Top;CA;99999;USA
+item1.X-ABADR:us
+X-ABShowAs:COMPANY
+UID:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/3.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/3.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/3.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Apple Inc.//AddressBook 6.1//EN
-UID:760d9b28-5a13-4880-b7eb-5769e6688fa3
-FN:Shared Group
-N:Shared Group;;;;
-REV:20120503T194243Z
-X-ADDRESSBOOKSERVER-KIND:group
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:8aa9ed15-5619-44d7-b061-51976dd5a174
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/3.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/3.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/3.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/3.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6688fa3
+FN:Shared Group
+N:Shared Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:8aa9ed15-5619-44d7-b061-51976dd5a174
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/4.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/4.xml	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/4.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,8 +0,0 @@
-<?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>Group Address Book</CS:summary>
-        <CS:read-write/>
-    </CS:set>
-</CS:share>
\ No newline at end of file

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/4.xml (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/4.xml)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/4.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/4.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -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>Group Address Book</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>
\ No newline at end of file

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/5.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/5.xml	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/5.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-notification shared-type='group'>
-    <uid></uid>
-    <href xmlns='DAV:'>$cuaddrurn2:</href>
-    <invite-noresponse/>
-    <access>
-      <read-write/>
-    </access>
-    <hosturl>
-      <href xmlns='DAV:'>$addressbookpath1:/3.vcf</href>
-    </hosturl>
-    <organizer>
-      <href xmlns='DAV:'>$principaluri1:</href>
-      <common-name>User 01</common-name>
-    </organizer>
-    <summary>Group Address Book</summary>
-  </invite-notification>
-</notification>

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/5.xml (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/5.xml)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/5.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/5.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='group'>
+    <uid></uid>
+    <href xmlns='DAV:'>$cuaddrurn2:</href>
+    <invite-noresponse/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>$addressbookpath1:/3.vcf</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>$principaluri1:</href>
+      <common-name>User 01</common-name>
+    </organizer>
+    <summary>Group Address Book</summary>
+  </invite-notification>
+</notification>

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/6.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/6.xml	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/6.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,13 +0,0 @@
-<?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:/3.vcf</href>
-  </hosturl>
-  <in-reply-to>$inviteuid:</in-reply-to>
-  <summary>Group Address Book</summary>
-  <common-name>$username2:</common-name>
-  <first-name>$firstname2:</first-name>
-  <last-name>$lastname2:</last-name>
-</invite-reply>

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/6.xml (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/6.xml)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/6.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/6.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -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:/3.vcf</href>
+  </hosturl>
+  <in-reply-to>$inviteuid:</in-reply-to>
+  <summary>Group Address Book</summary>
+  <common-name>$username2:</common-name>
+  <first-name>$firstname2:</first-name>
+  <last-name>$lastname2:</last-name>
+</invite-reply>

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/7.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/7.xml	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/7.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,8 +0,0 @@
-<?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>

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/7.xml (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/7.xml)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/7.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/7.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -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>

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/8.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/8.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/8.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,9 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Apple Inc.//AddressBook 6.1//EN
-UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
-FN:Subsub Group
-N:Subsub Group;;;;
-X-ADDRESSBOOKSERVER-KIND:group
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/8.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/8.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/8.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/8.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,9 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
+FN:Subsub Group
+N:Subsub Group;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
+END:VCARD

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/9.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/9.vcf	2013-05-14 23:30:05 UTC (rev 11181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/9.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,9 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Apple Inc.//AddressBook 6.1//EN
-UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
-FN:Subsub Group
-N:Subsub Group;;;;
-X-ADDRESSBOOKSERVER-KIND:group
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
-END:VCARD

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/9.vcf (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV/sharing/groups/read-write/9.vcf)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/9.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/groups/read-write/9.vcf	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,9 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
+FN:Subsub Group
+N:Subsub Group;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
+END:VCARD

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/2.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/2.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -8,7 +8,7 @@
       <read-write/>
     </access>
     <hosturl>
-      <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+      <href xmlns='DAV:'>$addressbookpath1:</href>
     </hosturl>
     <organizer>
       <href xmlns='DAV:'>$principaluri1:</href>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/3.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/3.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -3,7 +3,7 @@
   <href xmlns='DAV:'>mailto:$email2:</href>
   <invite-accepted/>
   <hosturl>
-    <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+    <href xmlns='DAV:'>$addressbookpath1:</href>
   </hosturl>
   <in-reply-to>$inviteuid:</in-reply-to>
   <summary>The Shared Address Book</summary>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/5.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/5.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/5.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
   <response>
-    <href>$addressbookhome1:/shared/</href>
+    <href>$addressbookpath1:/</href>
     <propstat>
       <prop>
         <invite xmlns='http://calendarserver.org/ns/'>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/6.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/6.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/accept/6.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -4,7 +4,7 @@
     <href xmlns='DAV:'>mailto:$email2:</href>
     <invite-accepted/>
     <hosturl>
-      <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+      <href xmlns='DAV:'>$addressbookpath1:</href>
     </hosturl>
     <in-reply-to>$inviteuid:</in-reply-to>
     <summary>The Shared Address Book</summary>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/1.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/1.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/1.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -3,7 +3,7 @@
   <href xmlns='DAV:'>mailto:$email2:</href>
   <invite-declined/>
   <hosturl>
-    <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+    <href xmlns='DAV:'>$addressbookpath1:</href>
   </hosturl>
   <in-reply-to>$inviteuid:</in-reply-to>
   <summary>The Shared Address Book</summary>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/3.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/3.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
   <response>
-    <href>$addressbookhome1:/shared/</href>
+    <href>$addressbookpath1:/</href>
     <propstat>
       <prop>
         <invite xmlns='http://calendarserver.org/ns/'>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/4.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/4.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/replies/decline/4.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -4,7 +4,7 @@
     <href xmlns='DAV:'>mailto:$email2:</href>
     <invite-declined/>
     <hosturl>
-      <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+      <href xmlns='DAV:'>$addressbookpath1:</href>
     </hosturl>
     <in-reply-to>$inviteuid:</in-reply-to>
     <common-name>$username2:</common-name>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/2.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/2.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -8,7 +8,7 @@
       <read-write/>
     </access>
     <hosturl>
-      <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+      <href xmlns='DAV:'>$addressbookpath1:</href>
     </hosturl>
     <organizer>
       <href xmlns='DAV:'>$principaluri1:</href>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/3.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/3.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -3,7 +3,7 @@
   <href xmlns='DAV:'>mailto:$email2:</href>
   <invite-accepted/>
   <hosturl>
-    <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+    <href xmlns='DAV:'>$addressbookpath1:</href>
   </hosturl>
   <in-reply-to>$inviteuid:</in-reply-to>
   <summary>The Shared Address Book</summary>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/5.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/5.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/5.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
   <response>
-    <href>$addressbookhome1:/shared/</href>
+    <href>$addressbookpath1:/</href>
     <propstat>
       <prop>
         <invite xmlns='http://calendarserver.org/ns/'>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/6.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/6.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV/sharing/setup/6.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -4,7 +4,7 @@
     <href xmlns='DAV:'>mailto:$email2:</href>
     <invite-accepted/>
     <hosturl>
-      <href xmlns='DAV:'>$addressbookhome1:/shared</href>
+      <href xmlns='DAV:'>$addressbookpath1:</href>
     </hosturl>
     <in-reply-to>$inviteuid:</in-reply-to>
     <summary>The Shared Address Book</summary>


Property changes on: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV
___________________________________________________________________
Added: svn:mergeinfo
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CardDAV:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev/scripts/tests/CardDAV:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/scripts/tests/CardDAV:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/CardDAV:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CardDAV:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/CardDAV:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/CardDAV:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/scripts/tests/CardDAV:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/tests/CardDAV:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/CardDAV:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/scripts/tests/CardDAV:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CardDAV:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV:11078-11181

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/aclreports.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/aclreports.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/aclreports.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -34,6 +34,7 @@
 				<filepath>Resource/CardDAV/vaclreports/10.xml</filepath>
 			</data>
 		</request>
+<!--
 		<request end-delete='yes'>
 			<method>MKCOL</method>
 			<ruri>$addressbookhome1:/adbktest2/</ruri>
@@ -58,6 +59,7 @@
 				<filepath>Resource/CardDAV/mkcol/1.xml</filepath>
 			</data>
 		</request>
+-->
 	</start>
 	
 	<test-suite name='acl-principal-prop-set REPORT' ignore='no'>
@@ -295,7 +297,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6' ignore='yes'>
 			<description>Valid principal-search report with DAV:prop</description>
 			<request print-response='no'>
 				<method>REPORT</method>
@@ -313,7 +315,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7' ignore='yes'>
 			<description>Valid principal-search report without DAV:prop</description>
 			<request print-response='no'>
 				<method>REPORT</method>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/add-member.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/add-member.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/add-member.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -26,7 +26,12 @@
 		<feature>add-member</feature>
 	</require-feature>
 
-	<start/>
+	<start>
+		<request print-response='no'>
+			<method>DELETE</method>
+			<ruri>$addressbookpath1:/</ruri>
+		</request>
+	</start>
 	
 	<test-suite name='DAV:add-member property'>
 		<test name='1'>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/default-addressbook.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/default-addressbook.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/default-addressbook.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -51,25 +51,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Change property'>
-		<test name='1'>
-			<description>MKCOL with correct request body</description>
-			<request end-delete='yes'>
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/adbktest1/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>201</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
+	<test-suite name='Change property' ignore='no'>
 		<test name='2'>
 			<description>Set invalid property on home</description>
 			<request print-response='no'>
@@ -123,54 +105,16 @@
 					<callback>propfindItems</callback>
 					<arg>
 						<name>okprops</name>
-						<value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookhome1:/adbktest1/</href>]]></value>
+						<value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookpath1:/</href>]]></value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 	</test-suite>
 
-	<test-suite name='Move delete'>
-		<test name='1'>
-			<description>MOVE</description>
-			<request end-delete='yes'>
-				<method>MOVE</method>
-				<ruri>$addressbookhome1:/adbktest1/</ruri>
-				<header>
-					<name>Destination</name>
-					<value>$host:$addressbookhome1:/adbktest2/</value>
-				</header>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='2'>
-			<description>PROPFIND on home</description>
-			<request end-delete='yes'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/default-addressbook/1.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookhome1:/adbktest2/</href>]]></value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
 	<test-suite name='No default delete'>
-		<test name='1'>
+<!--  
+		<test name='1' ignore='yes'>
 			<description>DELETE</description>
 			<request end-delete='yes'>
 				<method>DELETE</method>
@@ -184,6 +128,7 @@
 				</verify>
 			</request>
 		</test>
+-->
 		<test name='2'>
 			<description>Set property on home</description>
 			<request print-response='no'>
@@ -191,7 +136,7 @@
 				<ruri>$addressbookhome1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/default-addressbook/4.xml</filepath>
+					<filepath>Resource/CardDAV/default-addressbook/3.xml</filepath>
 				</data>
 				<verify>
 					<callback>propfindItems</callback>
@@ -206,7 +151,7 @@
 			<description>DELETE</description>
 			<request end-delete='yes'>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/adbktest2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/get.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/get.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/get.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -230,7 +230,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='GET on home'>
+	<test-suite name='GET on home' ignore='no'>
 		<require-feature>
 			<feature>directory listing</feature>
 		</require-feature>
@@ -260,51 +260,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2'>
-			<description>Create a addressbook</description>
-			<request>
-				<method>DELAY</method>
-				<ruri>1</ruri>
-			</request>
-			<request end-delete="yes">
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/testadbk/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='3'>
-			<description>GET on addressbook home, changed headers</description>
-			<request>
-				<method>GET</method>
-				<ruri>$addressbookhome1:/</ruri>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>header</callback>
-					<arg>
-						<name>header</name>
-						<value>Etag!$etag1:</value>
-						<value>Last-Modified!$last-modified1:</value>
-					</arg>
-				</verify>
-				<grabheader>
-					<name>Etag</name>
-					<variable>$etag2:</variable>
-				</grabheader>
-				<grabheader>
-					<name>Last-Modified</name>
-					<variable>$last-modified2:</variable>
-				</grabheader>
-			</request>
-		</test>
-		<test name='4'>
+		<test name='4' ignore='no'>
 			<description>Conditional GET on addressbook home</description>
 			<request print-response="no">
 				<method>GET</method>
@@ -329,7 +285,7 @@
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>If-Modified-Since</name>
-					<value>$last-modified2:</value>
+					<value>$last-modified1:</value>
 				</header>
 				<verify>
 					<callback>statusCode</callback>
@@ -341,14 +297,14 @@
 			</request>
 		</test>
 		<test name='6'>
-			<description>Delete a addressbook</description>
+			<description>Delete the addressbook</description>
 			<request>
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
 			<request end-delete="yes">
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/testadbk/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -366,8 +322,8 @@
 					<callback>header</callback>
 					<arg>
 						<name>header</name>
-						<value>Etag!$etag2:</value>
-						<value>Last-Modified!$last-modified2:</value>
+						<value>Etag!$etag1:</value>
+						<value>Last-Modified!$last-modified1:</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/limits.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/limits.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/limits.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -75,7 +75,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Collection limit' ignore='no'>
+<!--
+	<test-suite name='Collection limit' ignore='yes'>
 		<test name='1' count='49' ignore='no'>
 			<description>Create collections to one below the limit</description>
 			<request end-delete='yes' print-response='no'>
@@ -113,6 +114,7 @@
 			</request>
 		</test>
 	</test-suite>
+-->
 
 	<end/>
 	

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/mkcol.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/mkcol.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/mkcol.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -26,8 +26,8 @@
 	<start/>
 	
 	<test-suite name='OPTIONS header' ignore='no'>
-		<test name='1'>
-			<description>Look for options header tag</description>
+		<test name='1' ignore='yes'>
+			<description>OPTIONS DAV: header does not contain extended-mkcol</description>
 			<request print-response="no">
 				<method>OPTIONS</method>
 				<ruri>$addressbookhome1:/</ruri>
@@ -35,122 +35,56 @@
 					<callback>header</callback>
 					<arg>
 						<name>header</name>
-						<value>*DAV$.*extended-mkcol.*</value>
+						<value>*DAV!.*extended-mkcol.*</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
-	</test-suite>
-
-	<test-suite name='MKCOL with body'>
-		<test name='1'>
-			<description>MKCOL with correct request body</description>
-			<request end-delete='yes'>
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/adbktest1/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/mkcol/1.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>201</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
 		<test name='2'>
-			<description>MKCOL with correct request body on existing resource</description>
-			<request>
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/adbktest1/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/mkcol/1.xml</filepath>
-				</data>
+			<description>OPTIONS Allow: header does not contain MKCOL</description>
+			<request print-response="no">
+				<method>OPTIONS</method>
+				<ruri>$addressbookhome1:/</ruri>
 				<verify>
-					<callback>prepostcondition</callback>
+					<callback>header</callback>
 					<arg>
-						<name>error</name>
-						<value>{DAV:}resource-must-be-null</value>
+						<name>header</name>
+						<value>*Allow!.*MKCOL.*</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
- 		<test name='3'>
-			<description>MKCOL with incorrect request body</description>
-			<request end-delete='yes' print-response='no'>
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/adbktest2/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/mkcol/2.xml</filepath>
-				</data>
+		<test name='3'>
+			<description>OPTIONS Allow: header does not contain MKCALENDAR</description>
+			<request print-response="no">
+				<method>OPTIONS</method>
+				<ruri>$addressbookhome1:/</ruri>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>header</callback>
 					<arg>
-						<name>status</name>
-						<value>403</value>
+						<name>header</name>
+						<value>*Allow!.*MKCALENDAR.*</value>
 					</arg>
-					<arg>
-						<name>root-element</name>
-						<value>{DAV:}mkcol-response</value>
-					</arg>
-					<arg>
-						<name>badprops</name>
-						<value>{DAV:}resourcetype</value>
-						<value>{DAV:}getetag</value>
-						<value>{DAV:}displayname</value>
-						<value>{urn:ietf:params:xml:ns:carddav}addressbook-description</value>
-					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookhome1:/adbktest2/</ruri>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>404</value>
-					</arg>
-				</verify>
-			</request>
 		</test>
-		<test name='4'>
-			<description>MKCOL with incorrect request body on existing resource</description>
-			<request>
+	</test-suite>
+
+	<test-suite name='MKCOL with body'>
+		<test name='1'>
+			<description>MKCOL with correct request body</description>
+			<request end-delete='yes'>
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/adbktest1/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/mkcol/2.xml</filepath>
+					<filepath>Resource/CardDAV/mkcol/1.xml</filepath>
 				</data>
 				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>{DAV:}resource-must-be-null</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5'>
-			<description>MKCOL with incorrect resourcetype on new resource</description>
-			<request>
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/adbktest3/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/mkcol/3.xml</filepath>
-				</data>
-				<verify>
 					<callback>statusCode</callback>
 					<arg>
 						<name>status</name>
-						<value>400</value>
+						<value>403</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/nonascii.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/nonascii.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/nonascii.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -27,7 +27,8 @@
 
 	<start/>
 
-	<test-suite name='non-ascii' ignore="no">
+<!--
+	<test-suite name='non-ascii' ignore="yes">
 		<test name='1' ignore="no">
 			<description>MKCOL with high-ascii</description>
 			<request print-response="no">
@@ -42,7 +43,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2' ignore="yes">
 			<description>MKCOL with non-ascii - duplicate</description>
 			<request print-response="no">
 				<method>MKCOL</method>
@@ -81,8 +82,10 @@
 			</request>
 		</test>
 	</test-suite>
+ -->
 	
-	<test-suite name='double byte' ignore="no">
+<!--
+	<test-suite name='double byte' ignore="yes">
 		<test name='1' ignore="no">
 			<description>MKCOL with double byte</description>
 			<request end-delete="no">
@@ -136,6 +139,7 @@
 			</request>
 		</test>
 	</test-suite>
+ -->
 <!--
 	<test-suite name='Non-ascii resource URI' ignore="no">
 		<test name='1' ignore="no">

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/resourceid.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/resourceid.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/resourceid.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -1,119 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2013 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<caldavtest>
-	<require-feature>
-		<feature>caldav</feature>
-		<feature>resource-id</feature>
-	</require-feature>
-
-	<start/>
-	
-	<test-suite name='Address book with move'>
-		<test name='1'>
-			<description>Simple MKCOL</description>
-			<request end-delete='yes'>
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/adbktest1/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>201</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>Check property</description>
-			<request print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/adbktest1/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value>{DAV:}resource-id</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3'>
-			<description>MOVE to new address book</description>
-			<request>
-				<method>MOVE</method>
-				<ruri>$addressbookhome1:/adbktest1/</ruri>
-				<header>
-					<name>Destination</name>
-					<value>$host:$addressbookhome1:/adbktest-moved/</value>
-				</header>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>2xx</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>Check property</description>
-			<request print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/adbktest-moved/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value>{DAV:}resource-id</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<end>
-		<request>
-			<method>DELETE</method>
-			<ruri>$addressbookhome1:/adbktest-moved/</ruri>
-		</request>
-	</end>
-
-</caldavtest>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-addressbooks.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-addressbooks.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -28,6 +28,10 @@
 
 	<start>
 		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETE</method>
+			<ruri>$addressbookpath1:/</ruri>
+		</request>
+		<request user="$userid1:" pswd="$pswd1:">
 			<method>DELETEALL</method>
 			<ruri>$notificationpath1:/</ruri>
 		</request>
@@ -35,25 +39,14 @@
 			<method>DELETEALL</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$addressbookhome1:/shared/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-			</data>
-			<verify>
-				<callback>statusCode</callback>
-			</verify>
-		</request>
 	</start>
 	
-	<test-suite name='Read-write addressbooks'>
+	<test-suite name='Read-write address book' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>POST</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/addressbooks/read-write/1.xml</filepath>
@@ -63,13 +56,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2'>
+		<test name='2' ignore='no'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -89,20 +82,13 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:">
-				<method>DELETE</method>
-				<ruri>$notificationpath2:/$inviteuid:</ruri>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
 		</test>
-		<test name='3'>
+		<test name='3' ignore='no'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data substitutions="yes">
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/addressbooks/read-write/3.xml</filepath>
 				</data>
@@ -115,9 +101,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4'>
+		<test name='4' ignore='no'>
 			<description>Shared address book exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$sharedaddressbook:/</ruri>
 				<header>
@@ -133,6 +119,8 @@
 					<arg>
 						<name>exists</name>
 						<value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</value>
 						<value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
 						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
 						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
@@ -147,9 +135,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4a'>
+		<test name='5' ignore='no'>
 			<description>Shared address book exists Depth:1</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<header>
@@ -184,10 +172,9 @@
 					</arg>
 				</verify>
 			</request>
-		</test>
-		<test name='5'>
+		</test><test name='6' ignore='no'>
 			<description>Sharee creates vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/1.vcf</ruri>
 				<data>
@@ -199,11 +186,11 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6'>
+		<test name='7' ignore='no'>
 			<description>Sharer sees vcard</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>GET</method>
-				<ruri>$addressbookhome1:/shared/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<verify>
 					<callback>addressDataMatch</callback>
 					<arg>
@@ -213,11 +200,11 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7'>
+		<test name='8' ignore='no'>
 			<description>Sharer changes vcard</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/shared/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/addressbooks/read-write/6.vcf</filepath>
@@ -227,9 +214,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8'>
+		<test name='9' ignore='no'>
 			<description>Sharee sees changed vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/1.vcf</ruri>
 				<verify>
@@ -241,11 +228,11 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9'>
+		<test name='10' ignore='no'>
 			<description>Sharer creates vcard</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/shared/2.vcf</ruri>
+				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/addressbooks/read-write/7.vcf</filepath>
@@ -255,9 +242,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10'>
+		<test name='11' ignore='no'>
 			<description>Sharee sees new vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/2.vcf</ruri>
 				<verify>
@@ -269,9 +256,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11'>
+		<test name='12' ignore='no'>
 			<description>Sharee changes vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/2.vcf</ruri>
 				<data>
@@ -283,11 +270,11 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12'>
+		<test name='13' ignore='no'>
 			<description>Sharer sees changed event</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>GET</method>
-				<ruri>$addressbookhome1:/shared/2.vcf</ruri>
+				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<verify>
 					<callback>addressDataMatch</callback>
 					<arg>
@@ -297,15 +284,47 @@
 				</verify>
 			</request>
 		</test>
+		<test name='14' ignore='no'>
+			<description>Sharee sees group with shared address book members</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>GET</method>
+				<ruri>$sharedaddressbook:/addressbook.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/addressbooks/read-write/9.vcf</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>UID</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='15' ignore='no'>
+			<description>Sharee cannot delete special group</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>DELETE</method>
+				<ruri>$sharedaddressbook:/addressbook.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
-	<test-suite name='Default address book cannot be shared address book' ignore='no'>
+	<test-suite name='Shared address book cannot be default address' ignore='no'>
 		<require-feature>
 			<feature>default-addressbook</feature>
 		</require-feature>
 		<test name='1'>
 			<description>Set property on home</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PROPPATCH</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<data>
@@ -348,9 +367,9 @@
 	<test-suite name='Change to read-only address book' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>POST</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/addressbooks/read-only/1.xml</filepath>
@@ -362,11 +381,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -396,7 +415,7 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<data substitutions='yes'>
@@ -414,7 +433,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared address book exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$sharedaddressbook:/</ruri>
 				<header>
@@ -430,6 +449,8 @@
 					<arg>
 						<name>exists</name>
 						<value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</value>
 						<value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
 						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
 					</arg>
@@ -446,7 +467,7 @@
 		</test>
 		<test name='5'>
 			<description>Create vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/3.vcf</ruri>
 				<data>
@@ -464,9 +485,9 @@
 		</test>
 		<test name='6'>
 			<description>Sharer creates vcard</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/shared/4.vcf</ruri>
+				<ruri>$addressbookpath1:/4.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/addressbooks/read-only/6.vcf</filepath>
@@ -478,7 +499,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharee sees new vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/4.vcf</ruri>
 				<verify>
@@ -492,7 +513,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharee cannot change vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/4.vcf</ruri>
 				<data>
@@ -509,293 +530,13 @@
 			</request>
 		</test>
 	</test-suite>
-	<test-suite name='Share main address book' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>POST invitation</description>
-			<request print-response='no'>
-				<method>POST</method>
-				<ruri>$addressbookpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/main/1.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>WAITCOUNT 1</method>
-				<ruri>$notificationpath2:/</ruri>
-			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GETNEW</method>
-				<ruri>$notificationpath2:/</ruri>
-				<verify>
-					<callback>xmlDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/main/2.xml</value>
-					</arg>
-					<arg>
-						<name>filter</name>
-						<value>{http://calendarserver.org/ns/}dtstamp</value>
-						<value>{http://calendarserver.org/ns/}uid</value>
-					</arg>
-				</verify>
-				<grabelement>
-					<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
-					<variable>$inviteuid:</variable>
-				</grabelement>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>POST</method>
-				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
-					<content-type>application/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/main/3.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<grabelement>
-					<name>{DAV:}href</name>
-					<variable>$sharedaddressbook:</variable>
-				</grabelement>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>Shared address book exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$sharedaddressbook:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/main/4.xml</filepath>
-				</data>
-				<verify>
-					<callback>xmlElementMatch</callback>
-					<arg>
-						<name>exists</name>
-						<value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
-						<value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
-						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
-						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
-						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
-						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
-					</arg>
-					<arg>
-						<name>notexists</name>
-						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
-						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>Sharee creates vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PUT</method>
-				<ruri>$sharedaddressbook:/1.vcf</ruri>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/main/5.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>Sharer sees vcard</description>
-			<request print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookpath1:/1.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/main/5.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>Sharer changes vcard</description>
-			<request print-response='no'>
-				<method>PUT</method>
-				<ruri>$addressbookpath1:/1.vcf</ruri>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/main/6.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='8' ignore='no'>
-			<description>Sharee sees changed vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GET</method>
-				<ruri>$sharedaddressbook:/1.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/main/6.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='9' ignore='no'>
-			<description>Sharer creates vcard</description>
-			<request print-response='no'>
-				<method>PUT</method>
-				<ruri>$addressbookpath1:/2.vcf</ruri>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/main/7.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='10' ignore='no'>
-			<description>Sharee sees new vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GET</method>
-				<ruri>$sharedaddressbook:/2.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/main/7.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='11' ignore='no'>
-			<description>Sharee changes vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PUT</method>
-				<ruri>$sharedaddressbook:/2.vcf</ruri>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/main/8.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='12' ignore='no'>
-			<description>Sharer sees changed event</description>
-			<request print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookpath1:/2.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/main/8.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='13' ignore='no'>
-			<description>Unshare main address book</description>
-			<request print-response='no'>
-				<method>POST</method>
-				<ruri>$addressbookpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/main/9.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>200</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='14' ignore='no'>
-			<description>Check Sharee notification collection and delete invite-deleted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>WAITCOUNT 1</method>
-				<ruri>$notificationpath2:/</ruri>
-			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GETNEW</method>
-				<ruri>$notificationpath2:/</ruri>
-				<verify>
-					<callback>xmlDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/main/10.xml</value>
-					</arg>
-					<arg>
-						<name>filter</name>
-						<value>{http://calendarserver.org/ns/}dtstamp</value>
-						<value>{http://calendarserver.org/ns/}uid</value>
-					</arg>
-				</verify>
-			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>DELETE</method>
-				<ruri>$</ruri>
-			</request>
-		</test>
-		<test name='15' ignore='no'>
-			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$shareeaddressbook:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>404</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='16' ignore='no'>
-			<description>Clean up main addressbook</description>
-			<request>
-				<method>DELETEALL</method>
-				<ruri>$addressbookpath1:/</ruri>
-			</request>
-		</test>
-	</test-suite>
-
+	
 	<end>
 		<request user="$useradmin:" pswd="$pswdadmin:">
 			<method>DELETEALL</method>
+			<ruri>$addressbookpath1:/</ruri>
 			<ruri>$notificationpath1:/</ruri>
 			<ruri>$notificationpath2:/</ruri>
-			<ruri>$notificationpath3:/</ruri>
-			<ruri>$notificationpath4:/</ruri>
 		</request>
 	</end>
 

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-feature.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-feature.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-feature.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -26,7 +26,16 @@
 		<feature>shared-addressbooks</feature>
 	</require-feature>
 
-	<start/>
+	<start>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETE</method>
+			<ruri>$addressbookpath1:/</ruri>
+		</request>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath1:/</ruri>
+		</request>
+	</start>
 	
 	<test-suite name='OPTIONS header' ignore='no'>
 		<test name='1'>
@@ -84,16 +93,12 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Upgrade addressbook to shared'>
+	<test-suite name='Upgrade addressbook to shared' ignore='no'>
 		<test name='1'>
-			<description>Create new addressbook</description>
-			<request end-delete="yes">
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/shared1/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-				</data>
+			<description>clear addressbook</description>
+			<request>
+				<method>DELETE</method>
+				<ruri>$addressbookpath1:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -103,7 +108,7 @@
 			<description>Not shared</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -125,7 +130,7 @@
 			<description>Upgrade via PROPPATCH</description>
 			<request print-response='no'>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/shared1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/feature/upgrade_collection/1.xml</filepath>

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-groups.xml (from rev 11181, CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV/sharing-groups.xml)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-groups.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-groups.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -0,0 +1,668 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2013 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test sharing address books</description>
+
+	<require-feature>
+		<feature>carddav</feature>
+		<feature>shared-addressbooks</feature>
+	</require-feature>
+
+	<start>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETE</method>
+			<ruri>$addressbookpath1:/</ruri>
+		</request>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath1:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath2:/</ruri>
+		</request>
+	</start>
+	
+
+	<test-suite name='read-write' ignore='yes'>
+		<test name='1' ignore='no'>
+			<description>Sharer creates 2 persons and a group</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/1.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookpath1:/2.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/2.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/3.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>POST invitation to user vCard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST invitation to group vCard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<value>200</value>
+				</verify>
+			</request>
+		</test>
+		<test name='3a' ignore='yes'>
+			<description>Sharer sees group as shared-owner</description>
+			<request user="$userid1:" pswd="$pswd1:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/7.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared-owner</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/5.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+					<variable>$inviteuid:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>Sharee replies ACCEPTED</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookhome2:/</ruri>
+				<data substitutions='yes'>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<grabelement>
+					<name>{DAV:}href</name>
+					<variable>$sharedgroup:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>Sharee sees shared address book</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$addressbookhome2:/$userid1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/7.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6a' ignore='no'>
+			<description>Sharee sees shared address book and shared vCards</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$addressbookhome2:/$userid1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/7.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>Shared address book exists Depth:1</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$addressbookhome2:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/addressbooks/read-write/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>parent</name>
+						<value>$multistatus-response-prefix:[^{DAV:}href=$addressbookhome2:/$userid1:/]</value>
+					</arg>
+					<arg>
+						<name>exists</name>
+						<value>$verify-response-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+						<value>$verify-response-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+						<value>$verify-response-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</value>
+						<value>$verify-response-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+						<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8' ignore='no'>
+			<description>Sharee sees shared group vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$sharedgroup:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/3.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='9' ignore='no'>
+			<description>Sharee cannot delete shared group vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$sharedgroup:</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='10' ignore='no'>
+			<description>Sharee creates group vcard with unknown member UID</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/8.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='11' ignore='no'>
+			<description>Sharee creates group vcard with member UID in ab but not in group</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/9.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='12' ignore='no'>
+			<description>Sharee creates vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/10.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='13' ignore='no'>
+			<description>Sharer sees vcard as group member</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/4.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/10.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/11.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='14' ignore='no'>
+			<description>Sharer changes vcard</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookpath1:/4.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/12.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='15' ignore='no'>
+			<description>Sharee sees changed vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/12.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='16' ignore='no'>
+			<description>Sharer creates subgroup that contains 2 already present members</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookpath1:/5.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/13.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='17' ignore='no'>
+			<description>Sharee sees new vcards</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookhome2:/$userid1:/5.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/13.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookhome2:/$userid1:/2.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/2.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookhome2:/$userid1:/1.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/1.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='18' ignore='no'>
+			<description>Sharee removes vCard from subgroup</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookhome2:/$userid1:/5.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/14.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='19' ignore='no'>
+			<description>Sharee cannot access removed sub group member</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookhome2:/$userid1:/1.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>404</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='20' ignore='no'>
+			<description>Sharer sees subgroup changes and removed subgroup member</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/5.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/14.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/1.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='21' ignore='no'>
+			<description>Sharee deletes vCard in subgroup</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$addressbookhome2:/$userid1:/2.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='22' ignore='no'>
+			<description>Sharer sees subgroup changes and sharee-deleted subgroup member</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/5.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/15.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/2.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/2.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='23' ignore='no'>
+			<description>Sharer deletes shared group</description>
+			<request print-response='no'>
+				<method>DELETE</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>204</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='23a' ignore='yes'>
+			<description>Unshare main address book</description>
+			<request print-response="no">
+				<method>POST</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/15a.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>200</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='24' ignore='no'>
+			<description>Check Sharee notification collection and delete invite-deleted</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/16.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$</ruri>
+			</request>
+		</test>
+		<test name='25' ignore='no'>
+			<description>No more shared addressbook</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$addressbookhome2:/$userid1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>404</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='26' ignore='no'>
+			<description>Clean up main addressbook</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$addressbookpath1:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
+	<end>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>DELETEALL</method>
+			<ruri>$addressbookpath1:/</ruri>
+			<ruri>$notificationpath1:/</ruri>
+			<ruri>$notificationpath2:/</ruri>
+			<ruri>$notificationpath3:/</ruri>
+			<ruri>$notificationpath4:/</ruri>
+		</request>
+	</end>
+
+</caldavtest>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-peruser-properties.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-peruser-properties.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -28,6 +28,10 @@
 
 	<start>
 		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETE</method>
+			<ruri>$addressbookpath1:/</ruri>
+		</request>
+		<request user="$userid1:" pswd="$pswd1:">
 			<method>DELETEALL</method>
 			<ruri>$notificationpath1:/</ruri>
 		</request>
@@ -35,25 +39,14 @@
 			<method>DELETEALL</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$addressbookhome1:/shared/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-			</data>
-			<verify>
-				<callback>statusCode</callback>
-			</verify>
-		</request>
 	</start>
 	
-	<test-suite name='Set up share'>
+	<test-suite name='Set up share' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>POST invitation</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/1.xml</filepath>
@@ -120,7 +113,7 @@
 			<description>Check accept status</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -171,7 +164,7 @@
 			<description>PROPPATCH of displayname</description>
 			<request print-response='no'>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/peruser-properties/nonglobal/1.xml</filepath>
@@ -186,7 +179,7 @@
 			</request>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -220,8 +213,8 @@
 				<verify>
 					<callback>propfindItems</callback>
 					<arg>
-						<name>okprops</name>
-						<value>{DAV:}displayname$The Shared Address Book</value>
+						<name>badprops</name>
+						<value>{DAV:}displayname</value>
 					</arg>
 				</verify>
 			</request>
@@ -267,7 +260,7 @@
 			<description>PROPFIND of shared displayname</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -292,7 +285,7 @@
 			<description>PROPPATCH of addressbook-description</description>
 			<request print-response='no'>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/peruser-properties/shadowable/1.xml</filepath>
@@ -307,7 +300,7 @@
 			</request>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -388,7 +381,7 @@
 			<description>PROPFIND of shared addressbook-description</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-replies.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-replies.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -28,6 +28,10 @@
 
 	<start>
 		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETE</method>
+			<ruri>$addressbookpath1:/</ruri>
+		</request>
+		<request user="$userid1:" pswd="$pswd1:">
 			<method>DELETEALL</method>
 			<ruri>$notificationpath1:/</ruri>
 		</request>
@@ -35,25 +39,14 @@
 			<method>DELETEALL</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$addressbookhome1:/shared/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-			</data>
-			<verify>
-				<callback>statusCode</callback>
-			</verify>
-		</request>
 	</start>
 	
-	<test-suite name='Send first reply'>
+	<test-suite name='Send first reply' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>POST invitation</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/replies/accept/1.xml</filepath>
@@ -120,7 +113,7 @@
 			<description>Check accept status</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -191,7 +184,7 @@
 			<description>Check sharer addressbook displyname</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -211,7 +204,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Update reply'>
+	<test-suite name='Update reply' ignore='no'>
 		<test name='1'>
 			<description>Sharee replies DECLINED</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
@@ -230,7 +223,7 @@
 			<description>Check declined status</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-unshare.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-unshare.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -28,6 +28,10 @@
 
 	<start>
 		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETE</method>
+			<ruri>$addressbookpath1:/</ruri>
+		</request>
+		<request user="$userid1:" pswd="$pswd1:">
 			<method>DELETEALL</method>
 			<ruri>$notificationpath1:/</ruri>
 		</request>
@@ -35,25 +39,14 @@
 			<method>DELETEALL</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$addressbookhome1:/shared/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-			</data>
-			<verify>
-				<callback>statusCode</callback>
-			</verify>
-		</request>
 	</start>
 	
-	<test-suite name='Set up share'>
+	<test-suite name='Set up share' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>POST invitation</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/1.xml</filepath>
@@ -120,7 +113,7 @@
 			<description>Check accept status</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -166,12 +159,12 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Delete'>
+	<test-suite name='Delete' ignore='no'>
 		<test name='1'>
 			<description>Sharer adds event</description>
 			<request print-response='no'>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/shared/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/unshare/shareedelete/1.vcf</filepath>
@@ -221,7 +214,7 @@
 			<description>Sharer still has addressbook data</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sync-report.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sync-report.xml	2013-05-15 00:32:59 UTC (rev 11182)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sync-report.xml	2013-05-15 00:34:09 UTC (rev 11183)
@@ -25,17 +25,13 @@
 	</require-feature>
 
 	<start>
-		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-			</data>
+		<request print-response='no'>
+			<method>DELETE</method>
+			<ruri>$addressbookpath1:/</ruri>
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$addressbookhome1:/syncaddressbook1/1.vcf</ruri>
+			<ruri>$addressbookpath1:/1.vcf</ruri>
 			<data>
 				<content-type>text/vcard; charset=utf-8</content-type>
 				<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
@@ -43,36 +39,12 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$addressbookhome1:/syncaddressbook1/2.vcf</ruri>
+			<ruri>$addressbookpath1:/2.vcf</ruri>
 			<data>
 				<content-type>text/vcard; charset=utf-8</content-type>
 				<filepath>Resource/CardDAV/vreports/put/2.vcf</filepath>
 			</data>
 		</request>
-		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-			</data>
-		</request>
-		<request>
-			<method>PUT</method>
-			<ruri>$addressbookhome1:/syncaddressbook2/1.vcf</ruri>
-			<data>
-				<content-type>text/vcard; charset=utf-8</content-type>
-				<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
-			</data>
-		</request>
-		<request>
-			<method>PUT</method>
-			<ruri>$addressbookhome1:/syncaddressbook2/2.vcf</ruri>
-			<data>
-				<content-type>text/vcard; charset=utf-8</content-type>
-				<filepath>Resource/CardDAV/vreports/put/2.vcf</filepath>
-			</data>
-		</request>
 	</start>
 	
 	<test-suite name='support-report-set' ignore='no'>
@@ -174,7 +146,7 @@
 			<description>On addressbook</description>
 			<request>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -208,7 +180,7 @@
 			<description>initial query - addressbook depth:1</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -248,8 +220,6 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook1/</value>
-						<value>syncaddressbook2/</value>
 					</arg>
 				</verify>
 			</request>
@@ -275,12 +245,8 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook1/</value>
-						<value>syncaddressbook1/1.vcf</value>
-						<value>syncaddressbook1/2.vcf</value>
-						<value>syncaddressbook2/</value>
-						<value>syncaddressbook2/1.vcf</value>
-						<value>syncaddressbook2/2.vcf</value>
+						<value>$addressbook:/1.vcf</value>
+						<value>$addressbook:/2.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -289,7 +255,7 @@
 			<description>add new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/3.vcf</filepath>
@@ -303,7 +269,7 @@
 			<description>new resource - addressbook depth:1</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -344,8 +310,6 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook1/</value>
-						<value>syncaddressbook2/</value>
 					</arg>
 				</verify>
 			</request>
@@ -371,13 +335,9 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook1/</value>
-						<value>syncaddressbook1/1.vcf</value>
-						<value>syncaddressbook1/2.vcf</value>
-						<value>syncaddressbook1/3.vcf</value>
-						<value>syncaddressbook2/</value>
-						<value>syncaddressbook2/1.vcf</value>
-						<value>syncaddressbook2/2.vcf</value>
+						<value>$addressbook:/1.vcf</value>
+						<value>$addressbook:/2.vcf</value>
+						<value>$addressbook:/3.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -386,7 +346,7 @@
 			<description>remove new resource</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -396,7 +356,7 @@
 			<description>remove new resource - addressbook depth:1</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -436,8 +396,6 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook1/</value>
-						<value>syncaddressbook2/</value>
 					</arg>
 				</verify>
 			</request>
@@ -463,12 +421,8 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook1/</value>
-						<value>syncaddressbook1/1.vcf</value>
-						<value>syncaddressbook1/2.vcf</value>
-						<value>syncaddressbook2/</value>
-						<value>syncaddressbook2/1.vcf</value>
-						<value>syncaddressbook2/2.vcf</value>
+						<value>$addressbook:/1.vcf</value>
+						<value>$addressbook:/2.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -477,7 +431,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
@@ -491,7 +445,7 @@
 			<description>changed resource - addressbook depth:1</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -531,8 +485,6 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook1/</value>
-						<value>syncaddressbook2/</value>
 					</arg>
 				</verify>
 			</request>
@@ -558,12 +510,8 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook1/</value>
-						<value>syncaddressbook1/1.vcf</value>
-						<value>syncaddressbook1/2.vcf</value>
-						<value>syncaddressbook2/</value>
-						<value>syncaddressbook2/1.vcf</value>
-						<value>syncaddressbook2/2.vcf</value>
+						<value>$addressbook:/1.vcf</value>
+						<value>$addressbook:/2.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -575,7 +523,7 @@
 			<description>initial query - grab token</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -602,7 +550,7 @@
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/3.vcf</filepath>
@@ -613,7 +561,7 @@
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -639,14 +587,14 @@
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -668,7 +616,7 @@
 			<description>remove resource (treated as old)</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -694,7 +642,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
@@ -705,7 +653,7 @@
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -731,7 +679,7 @@
 			<description>no change</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -756,7 +704,7 @@
 			<description>initial query</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -787,7 +735,7 @@
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/3.vcf</filepath>
@@ -798,7 +746,7 @@
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -830,14 +778,14 @@
 			<description>remove resource new resource</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -868,7 +816,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
@@ -879,7 +827,7 @@
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -913,7 +861,7 @@
 			<description>initial query - grab token</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -948,7 +896,7 @@
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/3.vcf</filepath>
@@ -959,7 +907,7 @@
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -993,14 +941,14 @@
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -1022,7 +970,7 @@
 			<description>remove resource (treated as old)</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -1051,7 +999,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
@@ -1062,7 +1010,7 @@
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -1096,7 +1044,7 @@
 			<description>no change</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -1132,23 +1080,11 @@
 			<description>Initialize</description>
 			<request print-response='no'>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/syncaddressbook1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 			</request>
-			<request print-response='no'>
-				<method>DELETE</method>
-				<ruri>$addressbookhome1:/syncaddressbook2/</ruri>
-			</request>
-			<request end-delete="yes">
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/syncaddressbook3/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-				</data>
-			</request>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook3/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
@@ -1156,36 +1092,12 @@
 			</request>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook3/2.vcf</ruri>
+				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/2.vcf</filepath>
 				</data>
 			</request>
-			<request end-delete="yes">
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/syncaddressbook4/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-				</data>
-			</request>
-			<request>
-				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook4/1.vcf</ruri>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
-				</data>
-			</request>
-			<request>
-				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook4/2.vcf</ruri>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/vreports/put/2.vcf</filepath>
-				</data>
-			</request>
 		</test>
 		<test name='2' ignore='no'>
 			<description>initial query - grab token</description>
@@ -1205,12 +1117,8 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook3/</value>
-						<value>syncaddressbook3/1.vcf</value>
-						<value>syncaddressbook3/2.vcf</value>
-						<value>syncaddressbook4/</value>
-						<value>syncaddressbook4/1.vcf</value>
-						<value>syncaddressbook4/2.vcf</value>
+						<value>$addressbook:/1.vcf</value>
+						<value>$addressbook:/2.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -1223,7 +1131,7 @@
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook3/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/3.vcf</filepath>
@@ -1247,7 +1155,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>syncaddressbook3/3.vcf</value>
+						<value>$addressbook:/3.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -1260,7 +1168,7 @@
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/syncaddressbook3/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -1280,7 +1188,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>badhrefs</name>
-						<value>syncaddressbook3/3.vcf</value>
+						<value>$addressbook:/3.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -1302,7 +1210,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>badhrefs</name>
-						<value>syncaddressbook3/3.vcf</value>
+						<value>$addressbook:/3.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -1315,7 +1223,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook3/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
@@ -1339,7 +1247,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>syncaddressbook3/1.vcf</value>
+						<value>$addressbook:/1.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -1394,12 +1302,8 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>syncaddressbook3/</value>
-						<value>syncaddressbook3/1.vcf</value>
-						<value>syncaddressbook3/2.vcf</value>
-						<value>syncaddressbook4/</value>
-						<value>syncaddressbook4/1.vcf</value>
-						<value>syncaddressbook4/2.vcf</value>
+						<value>$addressbook:/1.vcf</value>
+						<value>$addressbook:/2.vcf</value>
 					</arg>
 				</verify>
 				<verify>
@@ -1420,7 +1324,7 @@
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook4/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/3.vcf</filepath>
@@ -1444,7 +1348,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>syncaddressbook4/3.vcf</value>
+						<value>$addressbook:/3.vcf</value>
 					</arg>
 				</verify>
 				<verify>
@@ -1465,7 +1369,7 @@
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/syncaddressbook4/3.vcf</ruri>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -1485,21 +1389,21 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>badhrefs</name>
-						<value>syncaddressbook4/3.vcf</value>
+						<value>$addressbook:/3.vcf</value>
 					</arg>
 				</verify>
 				<verify>
 					<callback>propfindItems</callback>
 					<arg>
 						<name>ignore</name>
-						<value>$addressbookhome1:/syncaddressbook4/</value>
+						<value>$addressbookpath1:/</value>
 					</arg>
 				</verify>
 				<verify>
 					<callback>propfindItems</callback>
 					<arg>
 						<name>ignore</name>
-						<value>$addressbookhome1:/syncaddressbook4/3.vcf</value>
+						<value>$addressbookpath1:/3.vcf</value>
 					</arg>
 					<arg>
 						<name>okprops</name>
@@ -1526,7 +1430,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>badhrefs</name>
-						<value>syncaddressbook4/3.vcf</value>
+						<value>$addressbook:/3.vcf</value>
 					</arg>
 				</verify>
 				<verify>
@@ -1542,7 +1446,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/syncaddressbook3/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/1.vcf</filepath>
@@ -1566,7 +1470,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>syncaddressbook3/1.vcf</value>
+						<value>$addressbook:/1.vcf</value>
 					</arg>
 				</verify>
 				<verify>
@@ -1615,7 +1519,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - delete/create addressbook - home depth:infinity' ignore='no'>
+	<test-suite name='simple reports - diff token - delete/create addressbook - home depth:infinity' ignore='yes'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130514/23d151f7/attachment-0001.html>


More information about the calendarserver-changes mailing list