[CalendarServer-changes] [13861] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Aug 8 18:50:29 PDT 2014


Revision: 13861
          http://trac.calendarserver.org//changeset/13861
Author:   gaya at apple.com
Date:     2014-08-08 18:50:29 -0700 (Fri, 08 Aug 2014)
Log Message:
-----------
rename resources used by ./scripts/tests/CalDAV/sharing-groups.xml

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/2a.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/2b.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/3a.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/3b.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/7.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/8.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-super/
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/2a.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/2b.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/3a.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/3b.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/5.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/7.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/8.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/9.ics

Removed Paths:
-------------
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group/
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write-group/

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/1.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -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>$gcuaddrurn2:</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read/>
+    </CS:set>
+</CS:share>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/2a.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/2a.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/2a.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>$cuaddrurn6:</href>
+    <invite-accepted/>
+    <access>
+      <read/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>$calendarhome1:/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>$principaluri1:</href>
+      <common-name>User 01</common-name>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+    <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+      <comp name="VEVENT" />
+    </supported-calendar-component-set>
+  </invite-notification>
+</notification>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/2b.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/2b.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/2b.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>$cuaddrurn7:</href>
+    <invite-accepted/>
+    <access>
+      <read/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>$calendarhome1:/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>$principaluri1:</href>
+      <common-name>User 01</common-name>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+    <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+      <comp name="VEVENT" />
+    </supported-calendar-component-set>
+  </invite-notification>
+</notification>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/3a.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/3a.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/3a.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>mailto:$email6:</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>$calendarhome1:/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuida:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+  <common-name>$username6:</common-name>
+  <first-name>$firstname6:</first-name>
+  <last-name>$lastname6:</last-name>
+</invite-reply>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/3b.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/3b.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/3b.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>mailto:$email7:</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>$calendarhome1:/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuidb:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+  <common-name>$username7:</common-name>
+  <first-name>$firstname7:</first-name>
+  <last-name>$lastname7:</last-name>
+</invite-reply>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/4.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/4.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -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>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/5.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid4:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/6.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid5:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 6
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only/7.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid5:
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 6
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/1.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -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>$cuaddr6:</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/2.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>$cuaddrurn6:</href>
+    <invite-accepted/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>$calendarhome1:/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>$principaluri1:</href>
+      <common-name>User 01</common-name>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+    <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+      <comp name="VEVENT" />
+    </supported-calendar-component-set>
+  </invite-notification>
+</notification>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/3.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>mailto:$email6:</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>$calendarhome1:/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuida:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+  <common-name>$username6:</common-name>
+  <first-name>$firstname6:</first-name>
+  <last-name>$lastname6:</last-name>
+</invite-reply>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/4.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/4.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -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>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/5.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid4:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/6.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid5:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 6
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-only-read-write-member/8.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
+DURATION:PT7H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 7-1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/1.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -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>$gcuaddrurn2:</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/2a.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/2a.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/2a.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>$cuaddrurn6:</href>
+    <invite-noresponse/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>$calendarhome1:/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>$principaluri1:</href>
+      <common-name>User 01</common-name>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+    <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+      <comp name="VEVENT" />
+    </supported-calendar-component-set>
+  </invite-notification>
+</notification>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/2b.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/2b.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/2b.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>$cuaddrurn7:</href>
+    <invite-noresponse/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>$calendarhome1:/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>$principaluri1:</href>
+      <common-name>User 01</common-name>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+    <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+      <comp name="VEVENT" />
+    </supported-calendar-component-set>
+  </invite-notification>
+</notification>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/3a.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/3a.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/3a.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>mailto:$email6:</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>$calendarhome1:/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuida:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+  <common-name>$username6:</common-name>
+  <first-name>$firstname6:</first-name>
+  <last-name>$lastname6:</last-name>
+</invite-reply>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/3b.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/3b.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/3b.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>mailto:$email7:</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>$calendarhome1:/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuidb:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+  <common-name>$username7:</common-name>
+  <first-name>$firstname7:</first-name>
+  <last-name>$lastname7:</last-name>
+</invite-reply>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/4.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/4.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:resourcetype/>
+<D:owner/>
+<D:current-user-privilege-set/>
+<C:schedule-calendar-transp/>
+</D:prop>
+</D:propfind>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/5.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/5.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/5.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<CS:invite/>
+</D:prop>
+</D:propfind>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/6.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT4H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 4
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/7.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 7
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/8.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
+DURATION:PT7H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 7-1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/9.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/read-write/9.ics	2014-08-09 01:50:29 UTC (rev 13861)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid3:
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
+DURATION:PT7H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 9.ics
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml	2014-08-08 22:35:59 UTC (rev 13860)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml	2014-08-09 01:50:29 UTC (rev 13861)
@@ -63,7 +63,7 @@
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/1.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/1.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -83,7 +83,7 @@
 					<callback>xmlDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-write-group/2a.xml</value>
+						<value>Resource/CalDAV/sharing/groups/read-write/2a.xml</value>
 					</arg>
 					<arg>
 						<name>filter</name>
@@ -110,7 +110,7 @@
 					<callback>xmlDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-write-group/2b.xml</value>
+						<value>Resource/CalDAV/sharing/groups/read-write/2b.xml</value>
 					</arg>
 					<arg>
 						<name>filter</name>
@@ -131,7 +131,7 @@
 				<ruri>$calendarhome6:/</ruri>
 				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/3a.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/3a.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -149,7 +149,7 @@
 				<ruri>$calendarhome7:/</ruri>
 				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/3b.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/3b.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -171,7 +171,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/4.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/4.xml</filepath>
 				</data>
 				<verify>
 					<callback>xmlElementMatch</callback>
@@ -206,7 +206,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/4.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/4.xml</filepath>
 				</data>
 				<verify>
 					<callback>xmlElementMatch</callback>
@@ -245,7 +245,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/4.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/4.xml</filepath>
 				</data>
 				<verify>
 					<callback>xmlElementMatch</callback>
@@ -280,7 +280,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/4.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/4.xml</filepath>
 				</data>
 				<verify>
 					<callback>xmlElementMatch</callback>
@@ -319,7 +319,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/4.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/4.xml</filepath>
 				</data>
 				<verify>
 					<callback>xmlElementMatch</callback>
@@ -338,7 +338,7 @@
 				<ruri>$sharedcalendara:/1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/5.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/5.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -354,7 +354,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-write-group/5.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-write/5.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -368,7 +368,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-write-group/5.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-write/5.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -380,7 +380,7 @@
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/6.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/6.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -396,7 +396,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-write-group/6.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-write/6.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -410,7 +410,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-write-group/6.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-write/6.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -422,7 +422,7 @@
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/7.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/7.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -438,7 +438,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-write-group/7.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-write/7.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -452,7 +452,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-write-group/7.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-write/7.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -464,7 +464,7 @@
 				<ruri>$sharedcalendarb:/2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-write-group/8.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-write/8.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -480,7 +480,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-write-group/8.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-write/8.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -495,7 +495,7 @@
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/1.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/1.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -515,7 +515,7 @@
 					<callback>xmlDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-only-group/2a.xml</value>
+						<value>Resource/CalDAV/sharing/groups/read-only/2a.xml</value>
 					</arg>
 					<arg>
 						<name>filter</name>
@@ -542,7 +542,7 @@
 					<callback>xmlDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-only-group/2b.xml</value>
+						<value>Resource/CalDAV/sharing/groups/read-only/2b.xml</value>
 					</arg>
 					<arg>
 						<name>filter</name>
@@ -563,7 +563,7 @@
 				<ruri>$calendarhome6:/</ruri>
 				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/3a.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/3a.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -581,7 +581,7 @@
 				<ruri>$calendarhome7:/</ruri>
 				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/3b.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/3b.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -603,7 +603,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/4.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/4.xml</filepath>
 				</data>
 				<verify>
 					<callback>xmlElementMatch</callback>
@@ -635,7 +635,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/4.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/4.xml</filepath>
 				</data>
 				<verify>
 					<callback>xmlElementMatch</callback>
@@ -663,7 +663,7 @@
 				<ruri>$sharedcalendara:/3.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/5.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/5.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -681,7 +681,7 @@
 				<ruri>$sharedcalendarb:/3.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/5.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/5.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -699,7 +699,7 @@
 				<ruri>$calendarhome1:/shared/4.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/6.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/6.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -715,7 +715,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-only-group/6.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-only/6.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -729,7 +729,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-only-group/6.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-only/6.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -741,7 +741,7 @@
 				<ruri>$sharedcalendara:/4.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/7.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/7.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -759,7 +759,7 @@
 				<ruri>$sharedcalendarb:/4.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group/7.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only/7.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -780,7 +780,7 @@
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/1.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only-read-write-member/1.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -800,7 +800,7 @@
 					<callback>xmlDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/2.xml</value>
+						<value>Resource/CalDAV/sharing/groups/read-only-read-write-member/2.xml</value>
 					</arg>
 					<arg>
 						<name>filter</name>
@@ -821,7 +821,7 @@
 				<ruri>$calendarhome6:/</ruri>
 				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/3.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only-read-write-member/3.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -843,7 +843,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/4.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only-read-write-member/4.xml</filepath>
 				</data>
 				<verify>
 					<callback>xmlElementMatch</callback>
@@ -877,7 +877,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/4.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only-read-write-member/4.xml</filepath>
 				</data>
 				<verify>
 					<callback>xmlElementMatch</callback>
@@ -905,7 +905,7 @@
 				<ruri>$sharedcalendarb:/3.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only-read-write-member/5.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -918,13 +918,12 @@
 		</test>
 		<test name='5a'>
 			<description>Create event allowed</description>
-			<description>Sharee creates event</description>
 			<request user="$userid6:" pswd="$pswd6:">
 				<method>PUT</method>
 				<ruri>$sharedcalendara:/3.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only-read-write-member/5.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -940,7 +939,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-only-read-write-member/5.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -954,7 +953,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-only-read-write-member/5.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -966,7 +965,7 @@
 				<ruri>$calendarhome1:/shared/4.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only-read-write-member/6.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -982,7 +981,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-only-read-write-member/6.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -996,7 +995,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics</value>
+						<value>Resource/CalDAV/sharing/groups/read-only-read-write-member/6.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -1008,7 +1007,7 @@
 				<ruri>$sharedcalendara:/2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/8.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only-read-write-member/8.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -1022,7 +1021,7 @@
 				<ruri>$sharedcalendarb:/2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/8.ics</filepath>
+					<filepath>Resource/CalDAV/sharing/groups/read-only-read-write-member/8.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -1035,6 +1034,15 @@
 		</test>
 	</test-suite>
 	
+	<!-- planned
+	<test-suite name='Add share to supergroup readonly' ignore="no">
+	</test-suite>
+
+	<test-suite name='Change subgroup readwrite' ignore="no">
+	</test-suite>
+	-->
+
+		
 	<end>
 		<request user="$useradmin:" pswd="$pswdadmin:">
 			<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140808/e677613b/attachment-0001.html>


More information about the calendarserver-changes mailing list