[CalendarServer-changes] [10322] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Jan 24 18:47:19 PST 2013 

Revision: 10322
          http://trac.calendarserver.org//changeset/10322
Author:   cdaboo at apple.com
Date:     2013-01-24 18:47:19 -0800 (Thu, 24 Jan 2013)
Log Message:
-----------
Test case where proxy declines an auto-accept resource and that status remains until a re-schedule.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/1.ics
    CalDAVTester/trunk/src/serverinfo.py

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/9.ics
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/1.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/1.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.8:T200000Z
+DTSTART:$now.8:T000000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/2.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/2.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.8:T200000Z
+DTSTART:$now.8:T000000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/3.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/3.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.8:T200000Z
+DTSTART:$now.8:T000000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/1.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/1.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.8:T200000Z
+DTSTART:$now.8:T000000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.15:T210000Z
+DTSTART:$now.15:T010000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.15:T200000Z
+RECURRENCE-ID:$now.15:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/2.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/2.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.8:T200000Z
+DTSTART:$now.8:T000000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.15:T210000Z
+DTSTART:$now.15:T010000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.15:T200000Z
+RECURRENCE-ID:$now.15:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/3.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/3.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.8:T200000Z
+DTSTART:$now.8:T000000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.15:T210000Z
+DTSTART:$now.15:T010000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.15:T200000Z
+RECURRENCE-ID:$now.15:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/1.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/1.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.8:T200000Z
+DTSTART:$now.8:T000000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.15:T210000Z
+DTSTART:$now.15:T010000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.15:T200000Z
+RECURRENCE-ID:$now.15:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -33,9 +33,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.22:T210000Z
+DTSTART:$now.22:T010000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.22:T200000Z
+RECURRENCE-ID:$now.22:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/2.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/2.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.8:T200000Z
+DTSTART:$now.8:T000000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.15:T210000Z
+DTSTART:$now.15:T010000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.15:T200000Z
+RECURRENCE-ID:$now.15:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -33,9 +33,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.22:T210000Z
+DTSTART:$now.22:T010000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.22:T200000Z
+RECURRENCE-ID:$now.22:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/3.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/3.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.8:T200000Z
+DTSTART:$now.8:T000000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.15:T210000Z
+DTSTART:$now.15:T010000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.15:T200000Z
+RECURRENCE-ID:$now.15:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -33,9 +33,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.22:T210000Z
+DTSTART:$now.22:T010000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.22:T200000Z
+RECURRENCE-ID:$now.22:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/1.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/1.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -32,7 +32,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.22:T203000Z
+DTSTART:$now.22:T003000Z
 DURATION:PT1H
 RECURRENCE-ID:$now.22:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/2.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/2.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -32,7 +32,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.22:T203000Z
+DTSTART:$now.22:T003000Z
 DURATION:PT1H
 RECURRENCE-ID:$now.22:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/3.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/3.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -18,7 +18,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.22:T203000Z
+DTSTART:$now.22:T003000Z
 DURATION:PT1H
 RECURRENCE-ID:$now.22:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/1.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/1.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.2:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/2.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/2.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.2:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/3.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/3.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -12,7 +12,7 @@
 DTSTAMP:20070309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.2:0215T200000Z
+EXDATE:$now.15:T200000Z
 SUMMARY:Recurring event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/1.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/1.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.2:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0222T210000Z
+DTSTART:$now.22:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.2:0222T200000Z
+RECURRENCE-ID:$now.22:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/2.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/2.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.2:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0222T210000Z
+DTSTART:$now.22:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.2:0222T200000Z
+RECURRENCE-ID:$now.22:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/3.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/3.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.2:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -12,8 +12,8 @@
 DTSTAMP:20070309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.2:0215T200000Z
-EXDATE:$now.year.2:0222T200000Z
+EXDATE:$now.15:T200000Z
+EXDATE:$now.22:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/1.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/1.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -7,7 +7,7 @@
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
@@ -22,7 +22,7 @@
 DURATION:PT1H
 RECURRENCE-ID:$now.1:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
@@ -37,7 +37,7 @@
 DURATION:PT1H
 RECURRENCE-ID:$now.2:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
@@ -52,7 +52,7 @@
 DURATION:PT1H
 RECURRENCE-ID:$now.3:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/1.ics	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/1.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -7,7 +7,7 @@
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
@@ -22,7 +22,7 @@
 DURATION:PT1H
 RECURRENCE-ID:$now.1:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
@@ -37,7 +37,7 @@
 DURATION:PT1H
 RECURRENCE-ID:$now.2:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
@@ -52,7 +52,7 @@
 DURATION:PT1H
 RECURRENCE-ID:$now.3:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
@@ -67,7 +67,7 @@
 DURATION:PT1H
 RECURRENCE-ID:$now.5:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/1.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1::$cuaddralt1:
+SUMMARY:Event
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/10.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/10.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:2
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/11.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/11.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:event-1
+RECURRENCE-ID:$now.2:T000000Z
+DTSTART:$now.2:T000000Z
+DURATION:PT1H
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:2
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/2.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Event
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/3.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Event
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/4.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Event
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:event-1
+RECURRENCE-ID:$now.2:T000000Z
+DTSTART:$now.2:T000000Z
+DURATION:PT1H
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Event
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/5.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Event
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:event-1
+RECURRENCE-ID:$now.2:T000000Z
+DTSTART:$now.2:T000000Z
+DURATION:PT1H
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Event
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/6.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:event-1
+RECURRENCE-ID:$now.2:T000000Z
+DTSTART:$now.2:T000000Z
+DURATION:PT1H
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/7.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:event-1
+RECURRENCE-ID:$now.2:T000000Z
+DTSTART:$now.2:T000000Z
+DURATION:PT1H
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/8.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:event-1
+RECURRENCE-ID:$now.2:T000000Z
+DTSTART:$now.2:T000000Z
+DURATION:PT1H
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:Event again
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/9.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto9/suite1/9.ics	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T000000Z
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=20
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:event-1
+RECURRENCE-ID:$now.2:T000000Z
+DTSTART:$now.2:T000000Z
+DURATION:PT1H
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;CN=$resourcename1::$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:Event again
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml	2013-01-25 02:47:19 UTC (rev 10322)
@@ -0,0 +1,418 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2013 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test implicit scheduling for auto-accept where proxy change is preserved</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>auto-accept</feature>
+		<feature>implicit-scheduling</feature>
+	</require-feature>
+
+	<start>
+		<request>
+			<method>DELETEALL</method>
+			<ruri>$inboxpath1:/</ruri>
+		</request>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>DELETEALL</method>
+			<ruri>$rinboxpath1:/</ruri>
+		</request>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>DELETEALL</method>
+			<ruri>$rcalendarpath1:/</ruri>
+		</request>
+	</start>
+	
+	<test-suite name='#1 Decline one valid instance' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>Create new event</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/implicit/auto9/suite1/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>One item in user01 Inbox</description>
+			<request print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$inboxpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>1</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>One item in user01 Calendar</description>
+			<request print-response="no">
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/auto9/suite1/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>No items in resource01 Inbox</description>
+			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$rinboxpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>0</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>One item in resource01 Calendar</description>
+			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$rcalendarpath1:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/auto9/suite1/3.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>Proxy decline resource01 Calendar</description>
+			<request print-response="no">
+				<method>PUT</method>
+				<ruri>$</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/implicit/auto9/suite1/4.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='7' ignore='no'>
+			<description>One item in user01 Inbox</description>
+			<request print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$inboxpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>1</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+		</test>
+		<test name='8' ignore='no'>
+			<description>One item in user01 Calendar</description>
+			<request print-response="no">
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/auto9/suite1/5.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='9' ignore='no'>
+			<description>Update event summary - resource partstat unchanged</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/implicit/auto9/suite1/6.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request>
+				<method>DELAY</method>
+				<ruri>1</ruri>
+			</request>
+		</test>
+		<test name='10' ignore='no'>
+			<description>No items in user01 Inbox</description>
+			<request print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$inboxpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>0</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='11' ignore='no'>
+			<description>One item in user01 Calendar</description>
+			<request print-response="no">
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/auto9/suite1/7.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='12' ignore='no'>
+			<description>No items in resource01 Inbox</description>
+			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$rinboxpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>0</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='13' ignore='no'>
+			<description>One item in resource01 Calendar</description>
+			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$rcalendarpath1:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/auto9/suite1/8.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='14' ignore='no'>
+			<description>Re-invite declined instance</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/implicit/auto9/suite1/9.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+		</test>
+		<test name='15' ignore='no'>
+			<description>One item in user01 Inbox</description>
+			<request print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$inboxpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>1</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='16' ignore='no'>
+			<description>One item in user01 Calendar</description>
+			<request print-response="no">
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/auto9/suite1/10.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='17' ignore='no'>
+			<description>No items in resource01 Inbox</description>
+			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$rinboxpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>0</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='18' ignore='no'>
+			<description>One item in resource01 Calendar</description>
+			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$rcalendarpath1:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/auto9/suite1/11.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean-up inboxes</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+			<request user="$useradmin:" pswd="$pswdadmin:">
+				<method>DELETEALL</method>
+				<ruri>$rinboxpath1:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
+	<end>
+		<request>
+			<method>DELETEALL</method>
+			<ruri>$inboxpath1:/</ruri>
+		</request>
+		<request>
+			<method>DELETEALL</method>
+			<ruri>$calendarpath1:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:">
+			<method>DELETEALL</method>
+			<ruri>$inboxpath2:/</ruri>
+		</request>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>DELETEALL</method>
+			<ruri>$calendarpath2:/</ruri>
+		</request>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>DELETEALL</method>
+			<ruri>$rinboxpath1:/</ruri>
+		</request>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>DELETEALL</method>
+			<ruri>$rcalendarpath1:/</ruri>
+		</request>
+	</end>
+	
+</caldavtest>

Modified: CalDAVTester/trunk/src/serverinfo.py
===================================================================
--- CalDAVTester/trunk/src/serverinfo.py	2013-01-24 22:18:37 UTC (rev 10321)
+++ CalDAVTester/trunk/src/serverinfo.py	2013-01-25 02:47:19 UTC (rev 10322)
@@ -53,8 +53,10 @@
                 value = "%d" % (self.dtnow.year + yearoffset,)
             elif sub[pos:].startswith("$now.month."):
                 monthoffset = int(sub[pos + 11:endpos])
-                dtoffset = self.dtnow + datetime.timedelta(months=monthoffset)
-                value = "%d%02d" % (dtoffset.year, dtoffset.month,)
+                month = self.dtnow.month + monthoffset
+                year = self.dtnow.year + divmod(month - 1, 12)[0]
+                month = divmod(month - 1, 12)[1] + 1
+                value = "%d%02d" % (year, month,)
             elif sub[pos:].startswith("$now.week."):
                 weekoffset = int(sub[pos + 10:endpos])
                 dtoffset = self.dtnow + datetime.timedelta(days=7 * weekoffset)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130124/a93992e7/attachment-0001.html>

More information about the calendarserver-changes mailing list