[CalendarServer-changes] [9382] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Jun 25 09:10:42 PDT 2012


Revision: 9382
          http://trac.macosforge.org/projects/calendarserver/changeset/9382
Author:   cdaboo at apple.com
Date:     2012-06-25 09:10:40 -0700 (Mon, 25 Jun 2012)
Log Message:
-----------
Remove COUNT=400 truncation behavior. Added upper/lower time range limits.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/brief/3.xml
    CalDAVTester/trunk/Resource/CalDAV/bulk/simple/10.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/26.xml
    CalDAVTester/trunk/Resource/CalDAV/errors/27.xml
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/3.xml
    CalDAVTester/trunk/Resource/CalDAV/prefer/minimal/3.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/8.txt
    CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/server/sslserverinfo.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/15.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/16.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/17.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/18.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/19.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/20.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/21.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/brief/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/brief/3.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/brief/3.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/bulk/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/10.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/bulk/simple/10.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -18,7 +18,7 @@
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1
-RRULE:FREQ=DAILY;COUNT=400
+RRULE:FREQ=DAILY
 BEGIN:VALARM
 ACTION:AUDIO
 TRIGGER;RELATED=START:-PT10M

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/26.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/26.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/26.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -37,7 +37,7 @@
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
 DTSTART;TZID="US/Eastern":$now.year.1:0101T000000
-DTEND;TZID="US/Eastern":20060102T000000
+DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/27.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/27.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/27.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -28,7 +28,7 @@
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
 DTSTART;TZID="US/Eastern":$now.year.1:0101T000000
-DTEND;TZID="US/Eastern":20060102T000000
+DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/2.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/2.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/3.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/3.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 TRANSP:TRANSPARENT
 END:VEVENT
 BEGIN:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/4.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/4.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/5.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/5.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/6.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/6.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/2.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/2.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/3.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/3.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 TRANSP:TRANSPARENT
 END:VEVENT
 BEGIN:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/4.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/4.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/5.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/5.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/6.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/6.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/1.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/1.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=2
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/4.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/4.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=2
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,7 +36,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
-DTEND;TZID=US/Eastern:20060102T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/1.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/1.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,7 +36,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0101T100000
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
@@ -48,7 +48,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
-DTEND;TZID=US/Eastern:20060104T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1-2
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/2.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/2.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,7 +36,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0101T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -48,7 +48,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
-DTEND;TZID=US/Eastern:20060104T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/3.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/3.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,7 +36,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0101T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -48,7 +48,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
-DTEND;TZID=US/Eastern:20060104T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/1.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/1.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,7 +36,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
-DTEND;TZID=US/Eastern:20060102T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
@@ -48,7 +48,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
-DTEND;TZID=US/Eastern:20060104T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1-2
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/2.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/2.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,7 +36,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
-DTEND;TZID=US/Eastern:20060102T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -48,7 +48,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
-DTEND;TZID=US/Eastern:20060104T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/3.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/3.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1-changed
 UID:event1 at ninevah.local
@@ -36,7 +36,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
-DTEND;TZID=US/Eastern:20060102T110000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
@@ -48,7 +48,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0104T120000
-DTEND;TZID=US/Eastern:20060104T130000
+DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1-2
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;TZID=America/New_York:$now.year.1:0101T110000
-DTEND;TZID=America/New_York:20060101T120000
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -5,7 +5,7 @@
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:$now.year.1:0101
-DTEND;VALUE=DATE:20060102
+DURATION:P1D
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -24,7 +24,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DTEND;TZID=US/Eastern:20060101T110000
+DURATION:PT1H
 SUMMARY:event 1 - changed
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/2.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/2.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/3.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/3.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 TRANSP:TRANSPARENT
 END:VEVENT
 BEGIN:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/4.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/4.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/5.ics	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/5.ics	2012-06-25 16:10:40 UTC (rev 9382)
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=WEEKLY;COUNT=400
+RRULE:FREQ=WEEKLY
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/3.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/3.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<C:time-range start="20060101T000000Z" end="20060105T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0105T000000Z"/>
 </C:free-busy-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/minimal/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/minimal/3.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/minimal/3.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Added: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/15.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/15.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/15.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data/>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:time-range start="$now.year.-3:0102T000000Z" end="$now.year.1:0103T000000Z"/>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/16.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/16.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/16.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data/>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:time-range start="$now.year.-3:0102T000000Z"/>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/17.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/17.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/17.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data/>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:time-range end="$now.year.-3:0102T000000Z"/>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/18.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/18.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/18.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data/>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:time-range start="$now.year.10:0102T000000Z" end="$now.year.10:0103T000000Z"/>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/19.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/19.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/19.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data/>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:time-range start="$now.year.10:0102T000000Z"/>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/20.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/20.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/20.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data/>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:time-range end="$now.year.10:0102T000000Z"/>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/21.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/21.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/21.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data/>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:time-range start="$now.year.1:0102T000000Z" end="$now.year.10:0103T000000Z"/>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/8.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/8.txt	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/8.txt	2012-06-25 16:10:40 UTC (rev 9382)
@@ -7,7 +7,7 @@
 	<C:filter>
 		<C:comp-filter name="VCALENDAR">
 			<C:comp-filter name="VEVENT">
-				<C:time-range start="$now.year.10:0102T000000Z" end="$now.year.10:0103T000000Z"/>
+				<C:time-range start="$now.year.4:0102T000000Z"/>
 			</C:comp-filter>
 		</C:comp-filter>
 	</C:filter>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -80,6 +80,8 @@
 		<feature>split-calendars</feature>				<!-- Calendars are split by component type -->
 		<feature>supported-component-sets</feature>		<!-- CALDAV:supported-calendar-component-sets on calendar homes -->
 		<feature>supported-component-sets-one</feature>	<!-- Only single component calendars allowed to be created -->
+		<feature>timerange-low-limit</feature>			<!-- Time-range only valid one year back -->
+		<feature>timerange-high-limit</feature>			<!-- Time-range only valid 5 years ahead -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 		<feature>webcal</feature>						<!-- Internet calendar subscription via GET on calendar collection -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -80,6 +80,8 @@
 		<feature>split-calendars</feature>				<!-- Calendars are split by component type -->
 		<feature>supported-component-sets</feature>		<!-- CALDAV:supported-calendar-component-sets on calendar homes -->
 		<feature>supported-component-sets-one</feature>	<!-- Only single component calendars allowed to be created -->
+		<feature>timerange-low-limit</feature>			<!-- Time-range only valid one year back -->
+		<feature>timerange-high-limit</feature>			<!-- Time-range only valid 5 years ahead -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 		<feature>webcal</feature>						<!-- Internet calendar subscription via GET on calendar collection -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -80,6 +80,8 @@
 		<feature>split-calendars</feature>				<!-- Calendars are split by component type -->
 		<feature>supported-component-sets</feature>		<!-- CALDAV:supported-calendar-component-sets on calendar homes -->
 		<feature>supported-component-sets-one</feature>	<!-- Only single component calendars allowed to be created -->
+		<feature>timerange-low-limit</feature>			<!-- Time-range only valid one year back -->
+		<feature>timerange-high-limit</feature>			<!-- Time-range only valid 5 years ahead -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 		<feature>webcal</feature>						<!-- Internet calendar subscription via GET on calendar collection -->

Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -81,6 +81,8 @@
 		<feature>split-calendars</feature>				<!-- Calendars are split by component type -->
 		<feature>supported-component-sets</feature>		<!-- CALDAV:supported-calendar-component-sets on calendar homes -->
 		<feature>supported-component-sets-one</feature>	<!-- Only single component calendars allowed to be created -->
+		<feature>timerange-low-limit</feature>			<!-- Time-range only valid one year back -->
+		<feature>timerange-high-limit</feature>			<!-- Time-range only valid 5 years ahead -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 		<feature>webcal</feature>						<!-- Internet calendar subscription via GET on calendar collection -->

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -1166,6 +1166,10 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>Cancel event</description>
+			<request>
+				<method>DELAY</method>
+				<ruri>1</ruri>
+			</request>
 			<request print-response="yes">
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/1.ics</ruri>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -696,7 +696,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT with RRULE truncation'>
+	<test-suite name='PUT with RRULE truncation' ignore='yes'> <!-- We no longer do RRULE truncation -->
 		<test name='1' ignore='no'>
 			<description>RRULE - no truncation count</description>
 			<request end-delete='yes'>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2012-06-22 23:15:02 UTC (rev 9381)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2012-06-25 16:10:40 UTC (rev 9382)
@@ -2010,7 +2010,9 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>19.ics</value>
+						<value>20.ics</value>
 						<value>21.ics</value>
+						<value>22.ics</value>
 					</arg>
 				</verify>
 			</request>
@@ -2505,6 +2507,153 @@
 				</verify>
 			</request>
 		</test>
+		<test name='25' ignore='no'>
+			<require-feature>
+				<feature>timerange-low-limit</feature>
+			</require-feature>
+			<description>query with both start/end below lower limit</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/15.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}min-date-time</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='26' ignore='no'>
+			<require-feature>
+				<feature>timerange-low-limit</feature>
+			</require-feature>
+			<description>query with start only below lower limit</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/16.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}min-date-time</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='27' ignore='no'>
+			<require-feature>
+				<feature>timerange-low-limit</feature>
+			</require-feature>
+			<description>query with end only below lower limit</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/17.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}min-date-time</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='28' ignore='no'>
+			<require-feature>
+				<feature>timerange-high-limit</feature>
+			</require-feature>
+			<description>query with both start/end above upper limit</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/18.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}max-date-time</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='29' ignore='no'>
+			<require-feature>
+				<feature>timerange-high-limit</feature>
+			</require-feature>
+			<description>query with start only above upper limit</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/19.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}max-date-time</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='30' ignore='no'>
+			<require-feature>
+				<feature>timerange-high-limit</feature>
+			</require-feature>
+			<description>query with end only above upper limit</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/20.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}max-date-time</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='31' ignore='no'>
+			<require-feature>
+				<feature>timerange-high-limit</feature>
+			</require-feature>
+			<description>query with start lower, end above upper limit</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/18.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}max-date-time</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
 	<test-suite name='alarm time-range query reports' ignore='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120625/4b796f34/attachment-0001.html>


More information about the calendarserver-changes mailing list