[CalendarServer-changes] [4250] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed May 13 09:21:55 PDT 2009


Revision: 4250
          http://trac.macosforge.org/projects/calendarserver/changeset/4250
Author:   cdaboo at apple.com
Date:     2009-05-13 09:21:55 -0700 (Wed, 13 May 2009)
Log Message:
-----------
Test the case where Attendee's client creates a "fake" master out of an overridden instance.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/1.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/2.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/3.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/4.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/5.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/6.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/1.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/2.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/3.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/4.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/5.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/6.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/7.ics

Removed Paths:
-------------
    CalDAVTester/trunk/Resource/implicit/compatibility/1.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/2.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/3.xml
    CalDAVTester/trunk/Resource/implicit/compatibility/4.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/5.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/6.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/7.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/8.ics

Deleted: CalDAVTester/trunk/Resource/implicit/compatibility/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/1.ics	2009-05-13 04:50:15 UTC (rev 4249)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/1.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -1,35 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20051222T205953Z
-CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-SUMMARY:event 1
-UID:event1 at ninevah.local
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RRULE:FREQ=DAILY;COUNT=3
-END:VEVENT
-END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/implicit/compatibility/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/2.ics	2009-05-13 04:50:15 UTC (rev 4249)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/2.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -1,36 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-CREATED:20060101T150000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-SUMMARY:event 1
-RRULE:FREQ=DAILY;COUNT=3
-END:VEVENT
-END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/implicit/compatibility/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/3.xml	2009-05-13 04:50:15 UTC (rev 4249)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/3.xml	2009-05-13 16:21:55 UTC (rev 4250)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:resourcetype/>
-<D:getetag/>
-</D:prop>
-</D:propfind>

Deleted: CalDAVTester/trunk/Resource/implicit/compatibility/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/4.ics	2009-05-13 04:50:15 UTC (rev 4249)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/4.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -1,37 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//CALENDARSERVER.ORG//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:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-CREATED:20060101T150000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-SUMMARY:event 1
-RRULE:FREQ=DAILY;COUNT=3
-TRANSP:TRANSPARENT
-X-APPLE-NEEDS-REPLY:TRUE
-END:VEVENT
-END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/implicit/compatibility/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/5.ics	2009-05-13 04:50:15 UTC (rev 4249)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/5.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -1,35 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
-CREATED:20060101T151000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1::$cuaddr1:
-SUMMARY:event 1
-RRULE:FREQ=DAILY;COUNT=3
-END:VEVENT
-END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/implicit/compatibility/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/6.ics	2009-05-13 04:50:15 UTC (rev 4249)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/6.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -1,36 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-CREATED:20060101T150000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-SUMMARY:event 1
-RRULE:FREQ=DAILY;COUNT=3
-END:VEVENT
-END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/implicit/compatibility/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/7.ics	2009-05-13 04:50:15 UTC (rev 4249)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/7.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -1,52 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20051222T205953Z
-CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-SUMMARY:event 1
-UID:event1 at ninevah.local
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RRULE:FREQ=DAILY;COUNT=3
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20051222T205953Z
-CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-SUMMARY:event 1
-UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060101T100000
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-BEGIN:VALARM
-ACTION:DISPLAY
-DESCRIPTION:Alarm for Organizer!
-TRIGGER;RELATED=START:-PT15M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/implicit/compatibility/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/8.ics	2009-05-13 04:50:15 UTC (rev 4249)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/8.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -1,54 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-CREATED:20060101T150000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-SUMMARY:event 1
-RRULE:FREQ=DAILY;COUNT=3
-END:VEVENT
-BEGIN:VEVENT
-UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060101T100000
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-CREATED:20060101T150000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:DISPLAY
-DESCRIPTION:Alarm for Organizer!
-TRIGGER;RELATED=START:-PT15M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/1.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,46 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at ninevah.local
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+SUMMARY:event 1
+UID:event1 at ninevah.local
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/2.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,47 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/3.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/4.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T151000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/5.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
+ vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/6.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,47 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/1.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at ninevah.local
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/2.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/3.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+RRULE:FREQ=DAILY;COUNT=3
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/4.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T151000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:event 1
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/5.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/6.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,52 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at ninevah.local
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at ninevah.local
+RECURRENCE-ID;TZID=US/Eastern:20060101T100000
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Alarm for Organizer!
+TRIGGER;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/7.ics	2009-05-13 16:21:55 UTC (rev 4250)
@@ -0,0 +1,54 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+RECURRENCE-ID;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Alarm for Organizer!
+TRIGGER;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml	2009-05-13 04:50:15 UTC (rev 4249)
+++ CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml	2009-05-13 16:21:55 UTC (rev 4250)
@@ -36,7 +36,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Organizer Merge - insignificant change' ignore='no'>
+	<test-suite name='Organizer Merge - insignificant change' ignore='yes'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request print-response='no'>
@@ -44,7 +44,7 @@
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/implicit/compatibility/1.ics</filepath>
+					<filepath>Resource/implicit/compatibility/organizer-merge/1.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -60,7 +60,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/implicit/compatibility/2.ics</value>
+						<value>Resource/implicit/compatibility/organizer-merge/2.ics</value>
 					</arg>
 				</verify>
 				<grabheader>
@@ -80,7 +80,7 @@
 				</header>
 				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
-					<filepath>Resource/implicit/compatibility/3.xml</filepath>
+					<filepath>Resource/implicit/1.xml</filepath>
 				</data>
 				<verify>
 					<callback>multistatusItems</callback>
@@ -100,7 +100,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/implicit/compatibility/4.ics</value>
+						<value>Resource/implicit/compatibility/organizer-merge/3.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -140,7 +140,7 @@
 				<ruri>$</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/implicit/compatibility/5.ics</filepath>
+					<filepath>Resource/implicit/compatibility/organizer-merge/4.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -158,7 +158,7 @@
 				</header>
 				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
-					<filepath>Resource/implicit/compatibility/3.xml</filepath>
+					<filepath>Resource/implicit/1.xml</filepath>
 				</data>
 				<verify>
 					<callback>multistatusItems</callback>
@@ -178,7 +178,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/implicit/compatibility/6.ics</value>
+						<value>Resource/implicit/compatibility/organizer-merge/5.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -215,7 +215,7 @@
 				</header>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/implicit/compatibility/7.ics</filepath>
+					<filepath>Resource/implicit/compatibility/organizer-merge/6.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -231,7 +231,7 @@
 					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/implicit/compatibility/8.ics</value>
+						<value>Resource/implicit/compatibility/organizer-merge/7.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -247,7 +247,7 @@
 				</header>
 				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
-					<filepath>Resource/implicit/compatibility/3.xml</filepath>
+					<filepath>Resource/implicit/1.xml</filepath>
 				</data>
 				<verify>
 					<callback>multistatusItems</callback>
@@ -279,6 +279,209 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='Attendee instance override as master' ignore='no'>
+		<test name='1'>
+			<description>Organizer invites Attendee to on overridden instance only</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/compatibility/oneinstance-rewrite/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Organizer checks data</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/implicit/compatibility/oneinstance-rewrite/2.ics</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>ETag</name>
+					<variable>$etag-organizer:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Attendee Inbox Item</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$inboxpath2:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/implicit/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>1</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Attendee has data</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$calendarpath2:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/implicit/compatibility/oneinstance-rewrite/3.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Attendee deletes Inbox Item</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$inboxpath2:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>204</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>Attendee -> Accepted removing R-ID</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$calendarpath2:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/compatibility/oneinstance-rewrite/4.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>Attendee has data</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/implicit/compatibility/oneinstance-rewrite/5.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Organizer Inbox Item</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$inboxpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/implicit/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>1</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='9'>
+			<description>Organizer data changed</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/implicit/compatibility/oneinstance-rewrite/6.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='10'>
+			<description>Organizer deletes Inbox Item</description>
+			<request print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$inboxpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>DELETE</method>
+				<ruri>$</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>204</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='11'>
+			<description>Clean-up</description>
+			<request user="$userid1:" pswd="$pswd1:">
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+			</request>
+			<request user="$userid1:" pswd="$pswd1:">
+				<method>DELETEALL</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$calendarpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
 	<end>
 		<request user="$useradmin:" pswd="$pswdadmin:">
 			<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090513/6f037b22/attachment-0001.html>


More information about the calendarserver-changes mailing list