[CalendarServer-changes] [10193] CalDAVTester/branches/release/CalDAVTester-4.3-dev

source_changes at macosforge.org source_changes at macosforge.org
Thu Jan 3 10:20:43 PST 2013


Revision: 10193
          http://trac.calendarserver.org//changeset/10193
Author:   cdaboo at apple.com
Date:     2013-01-03 10:20:43 -0800 (Thu, 03 Jan 2013)
Log Message:
-----------
Fix relative date handling for auto-accept tests so that the dates used are less than one year in the future. Also generalize the date
substitution mechanism to allow any numeric offset to be used.

Modified Paths:
--------------
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite8/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/data/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/1.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/2.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/3.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/4.ics
    CalDAVTester/branches/release/CalDAVTester-4.3-dev/src/serverinfo.py

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite1/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite2/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite3/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0206T200000Z
+DTSTART:$now.6:T200000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0206T200000Z
+DTSTART:$now.6:T200000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
@@ -19,8 +19,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:$now.year.1:0208T200000Z
-DTSTART:$now.year.1:0208T200000Z
+RECURRENCE-ID:$now.8:T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0206T200000Z
+DTSTART:$now.6:T200000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
@@ -19,8 +19,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:$now.year.1:0208T200000Z
-DTSTART:$now.year.1:0208T200000Z
+RECURRENCE-ID:$now.8:T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite4/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0206T200000Z
+DTSTART:$now.6:T200000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
@@ -19,8 +19,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:$now.year.1:0208T200000Z
-DTSTART:$now.year.1:0208T200000Z
+RECURRENCE-ID:$now.8:T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0206T100000Z
+DTSTART:$now.6:T100000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0206T100000Z
+DTSTART:$now.6:T100000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0206T100000Z
+DTSTART:$now.6:T100000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite5/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0206T100000Z
+DTSTART:$now.6:T100000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:$now.year.1:0210T104500Z
+DTSTART:$now.10:T104500Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:$now.year.1:0210T104500Z
+DTSTART:$now.10:T104500Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:$now.year.1:0210T104500Z
+DTSTART:$now.10:T104500Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite6/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:$now.year.1:0210T104500Z
+DTSTART:$now.10:T104500Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:$now.year.1:0210T080000Z
+DTSTART:$now.10:T080000Z
 DURATION:PT1H
 RRULE:FREQ=HOURLY;COUNT=8
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:$now.year.1:0210T080000Z
+DTSTART:$now.10:T080000Z
 DURATION:PT1H
 RRULE:FREQ=HOURLY;COUNT=8
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
@@ -19,8 +19,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-6
-RECURRENCE-ID:$now.year.1:0210T100000Z
-DTSTART:$now.year.1:0210T100000Z
+RECURRENCE-ID:$now.10:T100000Z
+DTSTART:$now.10:T100000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:$now.year.1:0210T080000Z
+DTSTART:$now.10:T080000Z
 DURATION:PT1H
 RRULE:FREQ=HOURLY;COUNT=8
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
@@ -19,8 +19,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-6
-RECURRENCE-ID:$now.year.1:0210T100000Z
-DTSTART:$now.year.1:0210T100000Z
+RECURRENCE-ID:$now.10:T100000Z
+DTSTART:$now.10:T100000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite7/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:$now.year.1:0210T080000Z
+DTSTART:$now.10:T080000Z
 DURATION:PT1H
 RRULE:FREQ=HOURLY;COUNT=8
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
@@ -19,8 +19,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-6
-RECURRENCE-ID:$now.year.1:0210T100000Z
-DTSTART:$now.year.1:0210T100000Z
+RECURRENCE-ID:$now.10:T100000Z
+DTSTART:$now.10:T100000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite8/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite8/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto1/suite8/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1: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:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite1/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1: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-1
-DTSTART:$now.year.1:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1: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-1
-DTSTART:$now.year.1:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite2/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 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.year.1:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1: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-1
-DTSTART:$now.year.1:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 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.year.1:0222T210000Z
+DTSTART:$now.22:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0222T200000Z
+RECURRENCE-ID:$now.22:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1: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-1
-DTSTART:$now.year.1:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 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.year.1:0222T210000Z
+DTSTART:$now.22:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0222T200000Z
+RECURRENCE-ID:$now.22:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite3/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 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.year.1:0215T210000Z
+DTSTART:$now.15:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T200000Z
+RECURRENCE-ID:$now.15:T200000Z
 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.year.1:0222T210000Z
+DTSTART:$now.22:T210000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0222T200000Z
+RECURRENCE-ID:$now.22:T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T100000Z
+DTSTART:$now.8:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
@@ -16,9 +16,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0215T110000Z
+DTSTART:$now.15:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T100000Z
+RECURRENCE-ID:$now.15:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T100000Z
+DTSTART:$now.8:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
@@ -16,9 +16,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0215T110000Z
+DTSTART:$now.15:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T100000Z
+RECURRENCE-ID:$now.15:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite4/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,9 +3,9 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0215T110000Z
+DTSTART:$now.15:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T100000Z
+RECURRENCE-ID:$now.15:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T100000Z
+DTSTART:$now.8:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0215T110000Z
+DTSTART:$now.15:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T100000Z
+RECURRENCE-ID:$now.15:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0222T110000Z
+DTSTART:$now.22:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0222T100000Z
+RECURRENCE-ID:$now.22:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T100000Z
+DTSTART:$now.8:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0215T110000Z
+DTSTART:$now.15:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T100000Z
+RECURRENCE-ID:$now.15:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0222T110000Z
+DTSTART:$now.22:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0222T100000Z
+RECURRENCE-ID:$now.22:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite5/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,9 +3,9 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0215T110000Z
+DTSTART:$now.15:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T100000Z
+RECURRENCE-ID:$now.15:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0222T110000Z
+DTSTART:$now.22:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0222T100000Z
+RECURRENCE-ID:$now.22:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T100000Z
+DTSTART:$now.8:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0215T110000Z
+DTSTART:$now.15:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T100000Z
+RECURRENCE-ID:$now.15:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0222T203000Z
+DTSTART:$now.22:T203000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0222T100000Z
+RECURRENCE-ID:$now.22:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T100000Z
+DTSTART:$now.8:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0215T110000Z
+DTSTART:$now.15:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T100000Z
+RECURRENCE-ID:$now.15:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0222T203000Z
+DTSTART:$now.22:T203000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0222T100000Z
+RECURRENCE-ID:$now.22:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto2/suite6/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,9 +3,9 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0215T110000Z
+DTSTART:$now.15:T110000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0215T100000Z
+RECURRENCE-ID:$now.15:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0222T203000Z
+DTSTART:$now.22:T203000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0222T100000Z
+RECURRENCE-ID:$now.22:T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1: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:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite1/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
@@ -12,7 +12,7 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0215T200000Z
+EXDATE:$now.15:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
@@ -12,7 +12,7 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0215T200000Z
+EXDATE:$now.15:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite2/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1: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:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0215T200000Z
+EXDATE:$now.15:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0208T200000Z
+DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -12,8 +12,8 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0215T200000Z
-EXDATE:$now.year.1:0308T200000Z,20060322T200000Z,20060405T200000Z
+EXDATE:$now.15:T200000Z
+EXDATE:$now.36:T200000Z,$now.50:T200000Z,$now.64:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1: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:
@@ -12,8 +12,8 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0215T200000Z
-EXDATE:$now.year.1:0308T200000Z,20060322T200000Z,20060405T200000Z
+EXDATE:$now.15:T200000Z
+EXDATE:$now.36:T200000Z,$now.50:T200000Z,$now.64:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite3/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1: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:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0215T200000Z
-EXDATE:$now.year.1:0308T200000Z,20060322T200000Z,20060405T200000Z
+EXDATE:$now.15:T200000Z
+EXDATE:$now.36:T200000Z,$now.50:T200000Z,$now.64:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0209T200000Z
+DTSTART:$now.9:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -17,7 +17,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0216T210000Z
+DTSTART:$now.16:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -25,13 +25,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0216T200000Z
+RECURRENCE-ID:$now.16:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0223T210000Z
+DTSTART:$now.23:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -39,13 +39,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0223T200000Z
+RECURRENCE-ID:$now.23:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0309T210000Z
+DTSTART:$now.37:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -53,13 +53,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0309T200000Z
+RECURRENCE-ID:$now.37:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0324T210000Z
+DTSTART:$now.52:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -67,7 +67,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0323T200000Z
+RECURRENCE-ID:$now.51:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0209T200000Z
+DTSTART:$now.9:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -17,7 +17,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0216T210000Z
+DTSTART:$now.16:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -25,13 +25,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0216T200000Z
+RECURRENCE-ID:$now.16:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0223T210000Z
+DTSTART:$now.23:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -39,13 +39,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0223T200000Z
+RECURRENCE-ID:$now.23:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0309T210000Z
+DTSTART:$now.37:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -53,13 +53,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0309T200000Z
+RECURRENCE-ID:$now.37:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0324T210000Z
+DTSTART:$now.52:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -67,7 +67,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0323T200000Z
+RECURRENCE-ID:$now.51:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite4/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0209T200000Z
+DTSTART:$now.9:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -17,7 +17,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0216T210000Z
+DTSTART:$now.16:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -25,13 +25,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0216T200000Z
+RECURRENCE-ID:$now.16:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0223T210000Z
+DTSTART:$now.23:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -39,13 +39,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0223T200000Z
+RECURRENCE-ID:$now.23:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0309T210000Z
+DTSTART:$now.37:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -53,13 +53,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0309T200000Z
+RECURRENCE-ID:$now.37:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0324T210000Z
+DTSTART:$now.52:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -67,7 +67,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0323T200000Z
+RECURRENCE-ID:$now.51:T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0209T200000Z
+DTSTART:$now.9:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -18,21 +18,21 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0216T210000Z
+DTSTART:$now.16:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0216T200000Z
+RECURRENCE-ID:$now.16:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0223T210000Z
+DTSTART:$now.23:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -40,14 +40,14 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0223T200000Z
+RECURRENCE-ID:$now.23:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0309T210000Z
+DTSTART:$now.37:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -55,14 +55,14 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0309T200000Z
+RECURRENCE-ID:$now.37:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0324T210000Z
+DTSTART:$now.52:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -70,7 +70,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0323T200000Z
+RECURRENCE-ID:$now.51:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0209T200000Z
+DTSTART:$now.9:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
@@ -18,21 +18,21 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0216T210000Z
+DTSTART:$now.16:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0216T200000Z
+RECURRENCE-ID:$now.16:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0223T210000Z
+DTSTART:$now.23:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
@@ -40,14 +40,14 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0223T200000Z
+RECURRENCE-ID:$now.23:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0309T210000Z
+DTSTART:$now.37:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
@@ -55,14 +55,14 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0309T200000Z
+RECURRENCE-ID:$now.37:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0324T210000Z
+DTSTART:$now.52:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
@@ -70,7 +70,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0323T200000Z
+RECURRENCE-ID:$now.51:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite5/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0209T200000Z
+DTSTART:$now.9:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -12,14 +12,14 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0216T200000Z
+EXDATE:$now.16:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0223T210000Z
+DTSTART:$now.23:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -27,14 +27,14 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0223T200000Z
+RECURRENCE-ID:$now.23:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0309T210000Z
+DTSTART:$now.37:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -42,14 +42,14 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0309T200000Z
+RECURRENCE-ID:$now.37:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0324T210000Z
+DTSTART:$now.52:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -57,7 +57,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0323T200000Z
+RECURRENCE-ID:$now.51:T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0209T200000Z
+DTSTART:$now.9:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -12,42 +12,42 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0223T200000Z
+EXDATE:$now.23:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0216T210000Z
+DTSTART:$now.16:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0216T200000Z
+RECURRENCE-ID:$now.16:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0309T210000Z
+DTSTART:$now.37:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0309T200000Z
+RECURRENCE-ID:$now.37:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0324T210000Z
+DTSTART:$now.52:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -55,7 +55,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0323T200000Z
+RECURRENCE-ID:$now.51:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0209T200000Z
+DTSTART:$now.9:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
@@ -12,42 +12,42 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0223T200000Z
+EXDATE:$now.23:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0216T210000Z
+DTSTART:$now.16:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0216T200000Z
+RECURRENCE-ID:$now.16:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0309T210000Z
+DTSTART:$now.37:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0309T200000Z
+RECURRENCE-ID:$now.37:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0324T210000Z
+DTSTART:$now.52:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
@@ -55,7 +55,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0323T200000Z
+RECURRENCE-ID:$now.51:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite6/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0209T200000Z
+DTSTART:$now.9:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -12,16 +12,16 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0223T200000Z
-EXDATE:$now.year.1:0216T200000Z
-EXDATE:$now.year.1:0309T200000Z
+EXDATE:$now.23:T200000Z
+EXDATE:$now.16:T200000Z
+EXDATE:$now.37:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0324T210000Z
+DTSTART:$now.52:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -29,7 +29,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0323T200000Z
+RECURRENCE-ID:$now.51:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0209T100000Z
+DTSTART:$now.9:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
@@ -16,7 +16,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0216T110000Z
+DTSTART:$now.16:T110000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -24,13 +24,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0216T100000Z
+RECURRENCE-ID:$now.16:T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0223T110000Z
+DTSTART:$now.23:T110000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -38,7 +38,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0223T100000Z
+RECURRENCE-ID:$now.23:T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0209T100000Z
+DTSTART:$now.9:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
@@ -16,7 +16,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0216T110000Z
+DTSTART:$now.16:T110000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -24,13 +24,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0216T100000Z
+RECURRENCE-ID:$now.16:T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0223T110000Z
+DTSTART:$now.23:T110000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -38,7 +38,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0223T100000Z
+RECURRENCE-ID:$now.23:T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite7/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0216T110000Z
+DTSTART:$now.16:T110000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -11,13 +11,13 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0216T100000Z
+RECURRENCE-ID:$now.16:T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0223T110000Z
+DTSTART:$now.23:T110000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -25,7 +25,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0223T100000Z
+RECURRENCE-ID:$now.23:T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0209T100000Z
+DTSTART:$now.9:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
@@ -11,14 +11,14 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0216T100000Z
+EXDATE:$now.16:T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0223T110000Z
+DTSTART:$now.23:T110000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -26,7 +26,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:$now.year.1:0223T100000Z
+RECURRENCE-ID:$now.23:T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0209T100000Z
+DTSTART:$now.9:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
@@ -11,14 +11,14 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:$now.year.1:0216T100000Z
+EXDATE:$now.16:T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0223T110000Z
+DTSTART:$now.23:T110000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -26,7 +26,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0223T100000Z
+RECURRENCE-ID:$now.23:T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto3/suite8/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0223T110000Z
+DTSTART:$now.23:T110000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -11,7 +11,7 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:$now.year.1:0223T100000Z
+RECURRENCE-ID:$now.23:T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0201T200000Z
+DTSTART:$now.1:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0201T200000Z
+DTSTART:$now.1:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite1/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0201T200000Z
+DTSTART:$now.1:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0201T200000Z
+DTSTART:$now.1:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddralt1:
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:$now.year.1:0203T200000Z
-DTSTART:$now.year.1:0203T210000Z
+RECURRENCE-ID:$now.3:T200000Z
+DTSTART:$now.3:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0201T200000Z
+DTSTART:$now.1:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:$now.year.1:0203T200000Z
-DTSTART:$now.year.1:0203T210000Z
+RECURRENCE-ID:$now.3:T200000Z
+DTSTART:$now.3:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite2/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0201T200000Z
+DTSTART:$now.1:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:$now.year.1:0203T200000Z
-DTSTART:$now.year.1:0203T210000Z
+RECURRENCE-ID:$now.3:T200000Z
+DTSTART:$now.3:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0201T200000Z
+DTSTART:$now.1:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddralt1:
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:$now.year.1:0203T200000Z
-DTSTART:$now.year.1:0203T210000Z
+RECURRENCE-ID:$now.3:T200000Z
+DTSTART:$now.3:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -33,8 +33,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:$now.year.1:0204T200000Z
-DTSTART:$now.year.1:0203T200000Z
+RECURRENCE-ID:$now.4:T200000Z
+DTSTART:$now.3:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0201T200000Z
+DTSTART:$now.1:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:$now.year.1:0203T200000Z
-DTSTART:$now.year.1:0203T210000Z
+RECURRENCE-ID:$now.3:T200000Z
+DTSTART:$now.3:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -33,8 +33,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:$now.year.1:0204T200000Z
-DTSTART:$now.year.1:0203T200000Z
+RECURRENCE-ID:$now.4:T200000Z
+DTSTART:$now.3:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto4/suite3/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0201T200000Z
+DTSTART:$now.1:T200000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -12,15 +12,15 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE:$now.year.1:0204T200000Z
+EXDATE:$now.4:T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:$now.year.1:0203T200000Z
-DTSTART:$now.year.1:0203T210000Z
+RECURRENCE-ID:$now.3:T200000Z
+DTSTART:$now.3:T210000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0209T000000Z
+DTSTART:$now.9:T000000Z
 DURATION:PT23H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0209T000000Z
+DTSTART:$now.9:T000000Z
 DURATION:PT23H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite1/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0209T000000Z
+DTSTART:$now.9:T000000Z
 DURATION:PT23H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0207T100000Z
+DTSTART:$now.7:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0207T100000Z
+DTSTART:$now.7:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -17,8 +17,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-RECURRENCE-ID:$now.year.1:0209T100000Z
-DTSTART:$now.year.1:0209T100000Z
+RECURRENCE-ID:$now.9:T100000Z
+DTSTART:$now.9:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite2/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0207T100000Z
+DTSTART:$now.7:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
@@ -17,8 +17,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-RECURRENCE-ID:$now.year.1:0209T100000Z
-DTSTART:$now.year.1:0209T100000Z
+RECURRENCE-ID:$now.9:T100000Z
+DTSTART:$now.9:T100000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0207T120000Z
+DTSTART:$now.7:T120000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
@@ -16,8 +16,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:$now.year.1:0209T120000Z
-DTSTART:$now.year.1:0209T123000Z
+RECURRENCE-ID:$now.9:T120000Z
+DTSTART:$now.9:T123000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0207T120000Z
+DTSTART:$now.7:T120000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
@@ -16,8 +16,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:$now.year.1:0209T120000Z
-DTSTART:$now.year.1:0209T123000Z
+RECURRENCE-ID:$now.9:T120000Z
+DTSTART:$now.9:T123000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite3/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:$now.year.1:0209T120000Z
-DTSTART:$now.year.1:0209T123000Z
+RECURRENCE-ID:$now.9:T120000Z
+DTSTART:$now.9:T123000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0207T150000Z
+DTSTART:$now.7:T150000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
@@ -16,8 +16,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:$now.year.1:0209T150000Z
-DTSTART:$now.year.1:0209T153000Z
+RECURRENCE-ID:$now.9:T150000Z
+DTSTART:$now.9:T153000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
@@ -30,8 +30,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:$now.year.1:0210T150000Z
-DTSTART:$now.year.1:0210T153000Z
+RECURRENCE-ID:$now.10:T150000Z
+DTSTART:$now.10:T153000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0207T150000Z
+DTSTART:$now.7:T150000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
@@ -16,8 +16,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:$now.year.1:0209T150000Z
-DTSTART:$now.year.1:0209T153000Z
+RECURRENCE-ID:$now.9:T150000Z
+DTSTART:$now.9:T153000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -30,8 +30,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:$now.year.1:0210T150000Z
-DTSTART:$now.year.1:0210T153000Z
+RECURRENCE-ID:$now.10:T150000Z
+DTSTART:$now.10:T153000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto5/suite4/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:$now.year.1:0209T150000Z
-DTSTART:$now.year.1:0209T153000Z
+RECURRENCE-ID:$now.9:T150000Z
+DTSTART:$now.9:T153000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
@@ -17,8 +17,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:$now.year.1:0210T150000Z
-DTSTART:$now.year.1:0210T153000Z
+RECURRENCE-ID:$now.10:T150000Z
+DTSTART:$now.10:T153000Z
 DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0104T000000Z
+DTSTART:$now.4:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0104T000000Z
+DTSTART:$now.4:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite1/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0104T000000Z
+DTSTART:$now.4:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0101T000000Z
+RECURRENCE-ID:$now.1:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -31,9 +31,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0102T000000Z
+DTSTART:$now.2:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0102T000000Z
+RECURRENCE-ID:$now.2:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -45,9 +45,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0103T000000Z
+DTSTART:$now.3:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0103T000000Z
+RECURRENCE-ID:$now.3:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite2/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0101T000000Z
+RECURRENCE-ID:$now.1:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -31,9 +31,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0102T000000Z
+DTSTART:$now.2:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0102T000000Z
+RECURRENCE-ID:$now.2:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -45,9 +45,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0103T000000Z
+DTSTART:$now.3:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0103T000000Z
+RECURRENCE-ID:$now.3:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,10 +3,10 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0104T000000Z
+DTSTART:$now.4:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
-EXDATE:$now.year.1:0105T000000Z
+EXDATE:$now.5:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,10 +3,10 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0104T000000Z
+DTSTART:$now.4:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
-EXDATE:$now.year.1:0105T000000Z
+EXDATE:$now.5:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite3/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,10 +3,10 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:0104T000000Z
+DTSTART:$now.4:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
-EXDATE:$now.year.1:0105T000000Z
+EXDATE:$now.5:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0101T000000Z
+RECURRENCE-ID:$now.1: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-2
-DTSTART:$now.year.1:0102T000000Z
+DTSTART:$now.2:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0102T000000Z
+RECURRENCE-ID:$now.2:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -48,9 +48,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0103T000000Z
+DTSTART:$now.3:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0103T000000Z
+RECURRENCE-ID:$now.3:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0101T000000Z
+RECURRENCE-ID:$now.1: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-2
-DTSTART:$now.year.1:0102T000000Z
+DTSTART:$now.2:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0102T000000Z
+RECURRENCE-ID:$now.2:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -48,9 +48,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0103T000000Z
+DTSTART:$now.3:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0103T000000Z
+RECURRENCE-ID:$now.3:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -63,9 +63,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0105T000000Z
+DTSTART:$now.5:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0105T000000Z
+RECURRENCE-ID:$now.5:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite4/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0101T000000Z
+RECURRENCE-ID:$now.1: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-2
-DTSTART:$now.year.1:0102T000000Z
+DTSTART:$now.2:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0102T000000Z
+RECURRENCE-ID:$now.2:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -48,9 +48,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0103T000000Z
+DTSTART:$now.3:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0103T000000Z
+RECURRENCE-ID:$now.3:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -63,9 +63,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0105T000000Z
+DTSTART:$now.5:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0105T000000Z
+RECURRENCE-ID:$now.5:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0101T000000Z
+RECURRENCE-ID:$now.1: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-2
-DTSTART:$now.year.1:0102T000000Z
+DTSTART:$now.2:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0102T000000Z
+RECURRENCE-ID:$now.2:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -48,9 +48,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0103T000000Z
+DTSTART:$now.3:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0103T000000Z
+RECURRENCE-ID:$now.3:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -63,9 +63,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0105T000000Z
+DTSTART:$now.5:T000000Z
 DURATION:PT1H
-RECURRENCE-ID:$now.year.1:0105T000000Z
+RECURRENCE-ID:$now.5:T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto6/suite6/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0101T000000Z
+DTSTART:$now.1:T000000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART;VALUE=DATE:$now.year.1:0208
+DTSTART;VALUE=DATE:$now.8:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART;VALUE=DATE:$now.year.1:0208
+DTSTART;VALUE=DATE:$now.8:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART;VALUE=DATE:$now.year.1:0208
+DTSTART;VALUE=DATE:$now.8:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite1/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART;VALUE=DATE:$now.year.1:0208
+DTSTART;VALUE=DATE:$now.8:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T010000Z
+DTSTART:$now.8:T010000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T010000Z
+DTSTART:$now.8:T010000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T010000Z
+DTSTART:$now.8:T010000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite2/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:$now.year.1:0208T010000Z
+DTSTART:$now.8:T010000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0208T220000Z
+DTSTART:$now.8:T220000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0208T220000Z
+DTSTART:$now.8:T220000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0208T220000Z
+DTSTART:$now.8:T220000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite3/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:$now.year.1:0208T220000Z
+DTSTART:$now.8:T220000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0209T120000Z
+DTSTART:$now.9:T120000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0209T120000Z
+DTSTART:$now.9:T120000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0209T120000Z
+DTSTART:$now.9:T120000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite4/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:$now.year.1:0209T120000Z
+DTSTART:$now.9:T120000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite5/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-6
-DTSTART;VALUE=DATE:$now.year.1:0209
-RECURRENCE-ID;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
+RECURRENCE-ID;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-6
-DTSTART;VALUE=DATE:$now.year.1:0209
-RECURRENCE-ID;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
+RECURRENCE-ID;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/auto7/suite6/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-6
-DTSTART;VALUE=DATE:$now.year.1:0209
-RECURRENCE-ID;VALUE=DATE:$now.year.1:0209
+DTSTART;VALUE=DATE:$now.9:
+RECURRENCE-ID;VALUE=DATE:$now.9:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-busy/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-free/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-always-recurring/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-busy/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-free/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 RRULE:FREQ=DAILY;COUNT=3
 DURATION:PT1H
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z
@@ -15,8 +15,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1 at example.com
-RECURRENCE-ID:$now.year.1:0102T120000Z
-DTSTART:$now.year.1:0102T120000Z
+RECURRENCE-ID:$now.2:T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z
@@ -15,8 +15,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1 at example.com
-RECURRENCE-ID:$now.year.1:0102T120000Z
-DTSTART:$now.year.1:0102T120000Z
+RECURRENCE-ID:$now.2:T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-busy/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-free/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 RRULE:FREQ=DAILY;COUNT=3
 DURATION:PT1H
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z
@@ -15,8 +15,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1 at example.com
-RECURRENCE-ID:$now.year.1:0102T120000Z
-DTSTART:$now.year.1:0102T120000Z
+RECURRENCE-ID:$now.2:T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/automatic-recurring/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z
@@ -15,8 +15,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1 at example.com
-RECURRENCE-ID:$now.year.1:0102T120000Z
-DTSTART:$now.year.1:0102T120000Z
+RECURRENCE-ID:$now.2:T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/data/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/data/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/data/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:block at example.com
-DTSTART;VALUE=DATE:$now.year.1:0102
+DTSTART;VALUE=DATE:$now.2:
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:Block out the day

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-busy/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-free/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-always-recurring/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-free/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z
@@ -15,8 +15,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1 at example.com
-RECURRENCE-ID:$now.year.1:0102T120000Z
-DTSTART:$now.year.1:0102T120000Z
+RECURRENCE-ID:$now.2:T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z
@@ -15,8 +15,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1 at example.com
-RECURRENCE-ID:$now.year.1:0102T120000Z
-DTSTART:$now.year.1:0102T120000Z
+RECURRENCE-ID:$now.2:T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-busy/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0102T120000Z
+DTSTART:$now.2:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-free/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automodes/none-recurring/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:$now.year.1:0101T120000Z
+DTSTART:$now.1:T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/1.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/1.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:1201T080000Z
+DTSTART:$now.1:T080000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/2.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/2.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:1201T080000Z
+DTSTART:$now.1:T080000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/3.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/3.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:1201T080000Z
+DTSTART:$now.1:T080000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/4.ics	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CalDAV/implicit/automultiple/suite1/4.ics	2013-01-03 18:20:43 UTC (rev 10193)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:$now.year.1:1201T080000Z
+DTSTART:$now.1:T080000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/branches/release/CalDAVTester-4.3-dev/src/serverinfo.py
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-4.3-dev/src/serverinfo.py	2012-12-20 21:15:56 UTC (rev 10192)
+++ CalDAVTester/branches/release/CalDAVTester-4.3-dev/src/serverinfo.py	2013-01-03 18:20:43 UTC (rev 10193)
@@ -23,7 +23,7 @@
 
 class serverinfo(object):
     """
-    Maintains information about the server being targetted.
+    Maintains information about the server being targeted.
     """
 
     def __init__(self):
@@ -37,33 +37,48 @@
         self.subsdict = {}
         self.extrasubsdict = {}
 
-        # Insert a bunch of date values
-        dtnow = datetime.date.today()
-        for dayoffset in xrange(-21, 21):
-            dtoffset = dtnow + datetime.timedelta(days=dayoffset)
-            key = "$now.%d:" % (dayoffset,)
-            value = "%d%02d%02d" % (dtoffset.year, dtoffset.month, dtoffset.day,)
-            self.subsdict[key] = value
-        for yearoffset in xrange(-5, 20):
-            key = "$now.year.%d:" % (yearoffset,)
-            value = "%d" % (dtnow.year + yearoffset,)
-            self.subsdict[key] = value
+        # dtnow needs to be fixed to a single date at the start of the tests just in case the tests
+        # run over a day boundary.
+        self.dtnow = datetime.date.today()
 
 
-    def subs(self, str, db=None):
+    def subs(self, sub, db=None):
+
+        # Special handling for relative date-times
+        pos = sub.find("$now.")
+        while pos != -1:
+            endpos = pos + sub[pos:].find(":")
+            if sub[pos:].startswith("$now.year."):
+                yearoffset = int(sub[pos + 10:endpos])
+                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,)
+            elif sub[pos:].startswith("$now.week."):
+                weekoffset = int(sub[pos + 10:endpos])
+                dtoffset = self.dtnow + datetime.timedelta(days=7 * weekoffset)
+                value = "%d%02d%02d" % (dtoffset.year, dtoffset.month, dtoffset.day,)
+            else:
+                dayoffset = int(sub[pos + 5:endpos])
+                dtoffset = self.dtnow + datetime.timedelta(days=dayoffset)
+                value = "%d%02d%02d" % (dtoffset.year, dtoffset.month, dtoffset.day,)
+            sub = "%s%s%s" % (sub[:pos], value, sub[endpos + 1:])
+            pos = sub.find("$now.")
+
         if db is None:
             db = self.subsdict
         count = 0
         while count < 10:
             do_again = False
             for key, value in db.iteritems():
-                newstr = str.replace(key, value)
-                do_again = do_again or (newstr != str)
-                str = newstr
+                newstr = sub.replace(key, value)
+                do_again = do_again or (newstr != sub)
+                sub = newstr
             if not do_again:
                 break
             count += 1
-        return str
+        return sub
 
 
     def addsubs(self, items, db=None):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130103/93c99f40/attachment-0001.html>


More information about the calendarserver-changes mailing list