[CalendarServer-changes] [4212] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri May 8 08:26:24 PDT 2009 

Revision: 4212
          http://trac.macosforge.org/projects/calendarserver/changeset/4212
Author:   cdaboo at apple.com
Date:     2009-05-08 08:26:23 -0700 (Fri, 08 May 2009)
Log Message:
-----------
Server now truncates RRULEs to keep number of instances within reasonable limits.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/1.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/2.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/3.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/4.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/5.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/6.ics
    CalDAVTester/trunk/Resource/implicit/recur1/rrule/1.ics
    CalDAVTester/trunk/Resource/implicit/recur1/rrule/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/rrule/4.ics
    CalDAVTester/trunk/Resource/implicit/recur1/rrule/5.ics
    CalDAVTester/trunk/Resource/implicit/recur1/rrule/6.ics
    CalDAVTester/trunk/scripts/tests/errors.xml
    CalDAVTester/trunk/scripts/tests/put.xml
    CalDAVTester/trunk/scripts/tests/reports.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/recurrenceput/11.ics
    CalDAVTester/trunk/Resource/recurrenceput/12.ics
    CalDAVTester/trunk/Resource/recurrenceput/13.ics
    CalDAVTester/trunk/Resource/recurrenceput/14.ics
    CalDAVTester/trunk/Resource/recurrenceput/15.ics
    CalDAVTester/trunk/Resource/recurrenceput/16.ics
    CalDAVTester/trunk/Resource/recurrenceput/17.ics
    CalDAVTester/trunk/Resource/recurrenceput/18.ics
    CalDAVTester/trunk/Resource/recurrenceput/19.ics

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/1.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/1.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RRULE:FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;COUNT=52
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/2.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/2.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;COUNT=52
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/3.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/3.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -31,7 +31,7 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 EXDATE;TZID=US/Eastern:20090413T150000
-RRULE:FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;COUNT=52
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/4.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/4.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;COUNT=52
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/5.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/5.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -32,7 +32,7 @@
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 EXDATE;TZID=US/Eastern:20090413T150000
 EXDATE;TZID=US/Eastern:20090406T150000
-RRULE:FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;COUNT=52
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/6.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/6.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;COUNT=52
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/rrule/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/rrule/1.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/recur1/rrule/1.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -25,7 +25,7 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
+RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/implicit/recur1/rrule/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/rrule/2.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/recur1/rrule/2.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -24,7 +24,7 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
+RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
 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:

Modified: CalDAVTester/trunk/Resource/implicit/recur1/rrule/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/rrule/4.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/recur1/rrule/4.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -24,7 +24,7 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
+RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
 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

Modified: CalDAVTester/trunk/Resource/implicit/recur1/rrule/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/rrule/5.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/recur1/rrule/5.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -24,7 +24,7 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-RRULE:FREQ=WEEKLY;WKST=SU;INTERVAL=1;BYDAY=MO,WE,FR
+RRULE:FREQ=WEEKLY;COUNT=52;WKST=SU;INTERVAL=1;BYDAY=MO,WE,FR
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T151000Z

Modified: CalDAVTester/trunk/Resource/implicit/recur1/rrule/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/rrule/6.ics	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/Resource/implicit/recur1/rrule/6.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -24,7 +24,7 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
+RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
 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:

Added: CalDAVTester/trunk/Resource/recurrenceput/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/recurrenceput/11.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/recurrenceput/11.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=100
+SUMMARY:event 1
+UID:event11r at example.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/recurrenceput/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/recurrenceput/12.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/recurrenceput/12.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+RRULE:FREQ=DAILY;UNTIL=20070101T170000Z
+SUMMARY:event 1
+UID:event11r at example.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/recurrenceput/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/recurrenceput/13.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/recurrenceput/13.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=600
+SUMMARY:event 1
+UID:event11r at example.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/recurrenceput/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/recurrenceput/14.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/recurrenceput/14.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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
+UID:event11r at example.local
+DTSTAMP:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=400
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/recurrenceput/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/recurrenceput/15.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/recurrenceput/15.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+RRULE:FREQ=DAILY;UNTIL=20090101T170000Z
+SUMMARY:event 1
+UID:event11r at example.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/recurrenceput/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/recurrenceput/16.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/recurrenceput/16.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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
+UID:event11r at example.local
+DTSTAMP:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=400
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/recurrenceput/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/recurrenceput/17.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/recurrenceput/17.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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
+UID:event11r at example.local
+DTSTAMP:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+RRULE:FREQ=YEARLY
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/recurrenceput/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/recurrenceput/18.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/recurrenceput/18.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+RRULE:FREQ=DAILY
+SUMMARY:event 1
+UID:event11r at example.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/recurrenceput/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/recurrenceput/19.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/recurrenceput/19.ics	2009-05-08 15:26:23 UTC (rev 4212)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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
+UID:event11r at example.local
+DTSTAMP:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=400
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/errors.xml	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/scripts/tests/errors.xml	2009-05-08 15:26:23 UTC (rev 4212)
@@ -255,7 +255,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8'>
+		<test name='8' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>PUT with too many recurrence instances to new resource</description>
 			<request print-response='no'>
 				<method>PUT</method>
@@ -273,7 +273,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9'>
+		<test name='9' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>PUT with too many recurrence instances to existing resource</description>
 			<request print-response='no'>
 				<method>PUT</method>
@@ -618,7 +618,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10'>
+		<test name='10' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>COPY with too many recurrence instances to new resource</description>
 			<request print-response='no'>
 				<method>COPY</method>
@@ -636,7 +636,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11'>
+		<test name='11' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>COPY with too many recurrence instances to existing resource</description>
 			<request print-response='no'>
 				<method>COPY</method>
@@ -855,7 +855,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10'>
+		<test name='10' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>MOVE with too many recurrence instances to new resource</description>
 			<request print-response='no'>
 				<method>MOVE</method>
@@ -873,7 +873,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11'>
+		<test name='11' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>MOVE with too many recurrence instances to existing resource</description>
 			<request print-response='no'>
 				<method>MOVE</method>

Modified: CalDAVTester/trunk/scripts/tests/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/put.xml	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/scripts/tests/put.xml	2009-05-08 15:26:23 UTC (rev 4212)
@@ -23,7 +23,7 @@
 
 	<start/>
 	
-	<test-suite name='PUT VEVENT'>
+	<test-suite name='PUT VEVENT' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>PUT non-recurring timed event</description>
 			<request end-delete='yes'>
@@ -186,7 +186,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Problem VEVENTs - EXDATE &amp; various combinations of date-time/date values'>
+	<test-suite name='Problem VEVENTs - EXDATE &amp; various combinations of date-time/date values' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>PUT problem event</description>
 			<request end-delete='yes'>
@@ -343,7 +343,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Problem VTODOs - various combinations of date-time/date values'>
+	<test-suite name='Problem VTODOs - various combinations of date-time/date values' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>DTSTART/DATE-TIME/UTC, DUE/DATE</description>
 			<request end-delete='yes'>
@@ -514,7 +514,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT with Content-Type parameters'>
+	<test-suite name='PUT with Content-Type parameters' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>PUT</description>
 			<request>
@@ -619,6 +619,201 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='PUT with RRULE truncation'>
+		<test name='1' ignore='no'>
+			<description>RRULE - no truncation count</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/recurrenceput/11.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>ETag</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/recurrenceput/11.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>RRULE - no truncation until</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/recurrenceput/12.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>ETag</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/recurrenceput/12.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>RRULE - truncation count</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/recurrenceput/13.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>!ETag</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/recurrenceput/14.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>RRULE - truncation until</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/recurrenceput/15.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>!ETag</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/recurrenceput/16.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>RRULE - no truncation unbounded yearly</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/recurrenceput/17.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>ETag</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/recurrenceput/17.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>RRULE - truncation unbounded daily</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/recurrenceput/18.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>!ETag</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2r.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/recurrenceput/19.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<end/>
 	
 </caldavtest>

Modified: CalDAVTester/trunk/scripts/tests/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/reports.xml	2009-05-08 14:41:52 UTC (rev 4211)
+++ CalDAVTester/trunk/scripts/tests/reports.xml	2009-05-08 15:26:23 UTC (rev 4212)
@@ -1300,7 +1300,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16' ignore='yes'> <!-- RRULE's now truncated -->
 			<description>query for VEVENTs within time range - too many</description>
 			<request>
 				<method>REPORT</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090508/db4d45f9/attachment-0001.html>

More information about the calendarserver-changes mailing list