[CalendarServer-changes] [9361] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Jun 15 09:26:18 PDT 2012


Revision: 9361
          http://trac.macosforge.org/projects/calendarserver/changeset/9361
Author:   cdaboo at apple.com
Date:     2012-06-15 09:26:13 -0700 (Fri, 15 Jun 2012)
Log Message:
-----------
Major clean-up and relative date related fixes. Removed a lot of old tests and modules that are no longer being used,
or have been superseded by other tools (e.g. loadsim). Changed all dates using a fixed year (e.g. '2006') to use
substitution variables that ensure the year is current, so that time-range etc test operate with current date rather
than stuff way in the past. All calendar data added for tests from now on should use substitutions for dates.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/acls/16.ics
    CalDAVTester/trunk/Resource/CalDAV/acls/17.ics
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/1.ics
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/2.ics
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/3.ics
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/4.ics
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/5.ics
    CalDAVTester/trunk/Resource/CalDAV/attachments/1.ics
    CalDAVTester/trunk/Resource/CalDAV/attachments/3.ics
    CalDAVTester/trunk/Resource/CalDAV/availability/1.ics
    CalDAVTester/trunk/Resource/CalDAV/availability/10.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/11.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/12.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/13.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/14.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/17.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/19.ics
    CalDAVTester/trunk/Resource/CalDAV/availability/2.ics
    CalDAVTester/trunk/Resource/CalDAV/availability/3.ics
    CalDAVTester/trunk/Resource/CalDAV/availability/4.ics
    CalDAVTester/trunk/Resource/CalDAV/availability/5.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/6.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/7.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/8.xml
    CalDAVTester/trunk/Resource/CalDAV/availability/9.xml
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_1.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_2.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_3.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_4.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_1.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_2.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_3.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_4.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_5.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_6.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_8.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_9.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_1.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_2.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_3.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_4a.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_4b.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_5a.txt
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_5b.txt
    CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/13.ics
    CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/9.ics
    CalDAVTester/trunk/Resource/CalDAV/copymove/1.txt
    CalDAVTester/trunk/Resource/CalDAV/copymove/2.txt
    CalDAVTester/trunk/Resource/CalDAV/copymove/3.txt
    CalDAVTester/trunk/Resource/CalDAV/copymove/4.txt
    CalDAVTester/trunk/Resource/CalDAV/copymove/5.txt
    CalDAVTester/trunk/Resource/CalDAV/copymove/6.txt
    CalDAVTester/trunk/Resource/CalDAV/ctag/2.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/1.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/2.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/3.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/3.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/6.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/7.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/8.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/9.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/6.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/7.ics
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/8.ics
    CalDAVTester/trunk/Resource/CalDAV/delete/1.txt
    CalDAVTester/trunk/Resource/CalDAV/delete/2.txt
    CalDAVTester/trunk/Resource/CalDAV/delete/3.txt
    CalDAVTester/trunk/Resource/CalDAV/delete/4.txt
    CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal1.ics
    CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal2.ics
    CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal3.ics
    CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal4.ics
    CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal5.ics
    CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal6.ics
    CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal7.ics
    CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal8.ics
    CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal9.ics
    CalDAVTester/trunk/Resource/CalDAV/dropbox/1.ics
    CalDAVTester/trunk/Resource/CalDAV/dropbox/2.ics
    CalDAVTester/trunk/Resource/CalDAV/dropbox/3.ics
    CalDAVTester/trunk/Resource/CalDAV/dropbox/4.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/2.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/26.xml
    CalDAVTester/trunk/Resource/CalDAV/errors/27.xml
    CalDAVTester/trunk/Resource/CalDAV/errors/28.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/3.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/33.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/34.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/35.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/36.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/37.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/38.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/39.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/4.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/40.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/42.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/5.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/6.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/7.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/8.ics
    CalDAVTester/trunk/Resource/CalDAV/errors/9.ics
    CalDAVTester/trunk/Resource/CalDAV/floating/1.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/2.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/3.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/4.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/5.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/6.xml
    CalDAVTester/trunk/Resource/CalDAV/floating/7.ics
    CalDAVTester/trunk/Resource/CalDAV/floating/put/1.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/put/2.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/put/3.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/put/4.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/put/5.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/put/6.txt
    CalDAVTester/trunk/Resource/CalDAV/floating/put/7.txt
    CalDAVTester/trunk/Resource/CalDAV/get/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite8/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/data/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/allday_freebusy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-delete/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-delete/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-all/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-all/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-all/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-all/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/bad-attendee-put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/bad-content-type/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/organizer-orphaned-instance/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/13.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/14.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/15.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/large/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/large/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/large/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/13.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/14.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/13.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/14.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/13.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/14.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/15.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/16.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/13.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/14.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/13.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/13.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/14.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/15.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/16.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/17.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/18.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/19.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/20.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/21.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/22.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/9.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/7.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics
    CalDAVTester/trunk/Resource/CalDAV/monitor/get/1.ics
    CalDAVTester/trunk/Resource/CalDAV/nonascii/1.ics
    CalDAVTester/trunk/Resource/CalDAV/nonascii/10.ics
    CalDAVTester/trunk/Resource/CalDAV/nonascii/11.ics
    CalDAVTester/trunk/Resource/CalDAV/nonascii/12.ics
    CalDAVTester/trunk/Resource/CalDAV/nonascii/13.ics
    CalDAVTester/trunk/Resource/CalDAV/nonascii/14.ics
    CalDAVTester/trunk/Resource/CalDAV/nonascii/6.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/5.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/7.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/1.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/2.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/3.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/4.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/1.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/10.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/2.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/4.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/5.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/6.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/7.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/8.ics
    CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/9.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/1.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/10.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/2.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/3.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/4.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/5.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/6.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/7.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/8.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/9.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/put/3.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/put/5.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/put/6.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/schedule/1.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/schedule/2.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/schedule/3.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/schedule/4.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/schedule/5.ics
    CalDAVTester/trunk/Resource/CalDAV/performance/schedule/6.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/1.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/10.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/11.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/12.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/13.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/14.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/2.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/3.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/4.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/5.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/6.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/7.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/8.ics
    CalDAVTester/trunk/Resource/CalDAV/prefer/return/9.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/1.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/10.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/11.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/12.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/13.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/14.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/15.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/16.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/17.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/18.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/19.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/2.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/20.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/21.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/22.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/23.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/24.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/25.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/26.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/27.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/28.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/29.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/30.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/31.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/33.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/34.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/36.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/38.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/4.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/40.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/41.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/5.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/6.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/7.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/8.ics
    CalDAVTester/trunk/Resource/CalDAV/privatecomments/9.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/10.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/11.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/12.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/13.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/3.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/38.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/39.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/40.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/41.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/42.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/43.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/44.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/45.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/46.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/47.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/48.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/49.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/5.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/50.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/6.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/7.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/8.ics
    CalDAVTester/trunk/Resource/CalDAV/privateevents/9.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/1.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/10.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/11.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/12.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/13.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/14.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/15.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/16.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/17.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/18.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/19.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/2.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/20.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/21.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/22.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/23.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/3.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/4.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/5.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/6.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/7.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/8.ics
    CalDAVTester/trunk/Resource/CalDAV/problemics/9.ics
    CalDAVTester/trunk/Resource/CalDAV/put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/put/3.ics
    CalDAVTester/trunk/Resource/CalDAV/quota/2.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/1.txt
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/11.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/12.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/13.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/14.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/15.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/16.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/17.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/18.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/19.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/2.txt
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/20.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/21.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/3.txt
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/4.txt
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/5.txt
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/6.txt
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/7.txt
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/8.txt
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/9.ics
    CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/1.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/2.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/3.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/4.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/5.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/13.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/14.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/freebusy/1.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/freebusy/2.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/1.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/10.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/2.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/3.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/4.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/5.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/6.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/7.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/8.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/9.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/put/1.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/10.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/102.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/103.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/104.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/105.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/106.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/11.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/12.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/13.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/14.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/15.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/16.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/17.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/18.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/19.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/2.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/20.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/21.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/22.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/23.ics
    CalDAVTester/trunk/Resource/CalDAV/reports/put/24.ics
    CalDAVTester/trunk/Resource/CalDAV/reports/put/25.ics
    CalDAVTester/trunk/Resource/CalDAV/reports/put/3.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/4.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/5.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/6.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/7.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/8.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/put/9.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/1.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/10.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/101.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/102.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/103.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/104.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/12.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/13.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/201.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/202.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/203.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/204.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/205.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/206.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/3.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/4.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/5.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/6.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/7.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/8.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/9.xml
    CalDAVTester/trunk/Resource/CalDAV/schedule/10.ics
    CalDAVTester/trunk/Resource/CalDAV/schedule/17.txt
    CalDAVTester/trunk/Resource/CalDAV/schedule/18.txt
    CalDAVTester/trunk/Resource/CalDAV/schedule/19.ics
    CalDAVTester/trunk/Resource/CalDAV/schedule/2.txt
    CalDAVTester/trunk/Resource/CalDAV/schedule/20.ics
    CalDAVTester/trunk/Resource/CalDAV/schedule/21.ics
    CalDAVTester/trunk/Resource/CalDAV/schedule/22.ics
    CalDAVTester/trunk/Resource/CalDAV/schedule/23.ics
    CalDAVTester/trunk/Resource/CalDAV/schedule/24.ics
    CalDAVTester/trunk/Resource/CalDAV/schedule/3.txt
    CalDAVTester/trunk/Resource/CalDAV/schedule/4.txt
    CalDAVTester/trunk/Resource/CalDAV/schedule/5.txt
    CalDAVTester/trunk/Resource/CalDAV/schedule/6.txt
    CalDAVTester/trunk/Resource/CalDAV/schedule/7.ics
    CalDAVTester/trunk/Resource/CalDAV/schedule/8.ics
    CalDAVTester/trunk/Resource/CalDAV/schedule/9.ics
    CalDAVTester/trunk/Resource/CalDAV/scheduleacl/3.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulecompatibility/1.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulecompatibility/4.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/1.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/10.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/11.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/12.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/13.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/14.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/2.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/3.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/4.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/5.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/6.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/7.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/8.ics
    CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/9.ics
    CalDAVTester/trunk/Resource/CalDAV/servertoserver/1.ics
    CalDAVTester/trunk/Resource/CalDAV/servertoserver/2.ics
    CalDAVTester/trunk/Resource/CalDAV/servertoserver/3.ics
    CalDAVTester/trunk/Resource/CalDAV/servertoserver/4.ics
    CalDAVTester/trunk/Resource/CalDAV/servertoserver/5.ics
    CalDAVTester/trunk/Resource/CalDAV/servertoserver/6.ics
    CalDAVTester/trunk/Resource/CalDAV/servertoserver/7.ics
    CalDAVTester/trunk/Resource/CalDAV/servertoserver/8.ics
    CalDAVTester/trunk/Resource/CalDAV/servertoserver/9.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/7.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/9.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/dropbox/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/moves/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/moves/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/moves/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/moves/4.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/moves/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/moves/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/moves/7.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/moves/8.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/10.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/7.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/8.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/quota/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/quota/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/setup/8.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/unshare/shareedelete/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/4.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/7.ics
    CalDAVTester/trunk/Resource/CalDAV/timezones/1.ics
    CalDAVTester/trunk/Resource/CalDAV/timezones/2.xml
    CalDAVTester/trunk/Resource/CalDAV/timezones/3.ics
    CalDAVTester/trunk/Resource/CalDAV/timezones/4.ics
    CalDAVTester/trunk/Resource/CalDAV/timezones/5.ics
    CalDAVTester/trunk/Resource/CalDAV/todo/10.txt
    CalDAVTester/trunk/Resource/CalDAV/todo/11.txt
    CalDAVTester/trunk/Resource/CalDAV/todo/3.txt
    CalDAVTester/trunk/Resource/CalDAV/todo/4.txt
    CalDAVTester/trunk/Resource/CalDAV/todo/7.txt
    CalDAVTester/trunk/Resource/CalDAV/todo/8.txt
    CalDAVTester/trunk/Resource/CalDAV/webcal/1.ics
    CalDAVTester/trunk/Resource/CalDAV/webcal/2.ics
    CalDAVTester/trunk/Resource/CalDAV/webcal/3.ics
    CalDAVTester/trunk/Resource/CalDAV/webcal/4.ics
    CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/scheduleimplicit-compatability.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/timezones.xml
    CalDAVTester/trunk/src/__init__.py
    CalDAVTester/trunk/src/request.py
    CalDAVTester/trunk/src/serverinfo.py
    CalDAVTester/trunk/src/xmlDefs.py
    CalDAVTester/trunk/utilities/__init__.py

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/schedulecompatibility/

Removed Paths:
-------------
    CalDAVTester/trunk/Resource/CalDAV/scheduleauto/
    CalDAVTester/trunk/Resource/CalDAV/scheduleautorecurcancel/
    CalDAVTester/trunk/Resource/CalDAV/scheduleautorecurrequest/
    CalDAVTester/trunk/Resource/CalDAV/scheduleautorecurspecial/
    CalDAVTester/trunk/Resource/CalDAV/schedulenormal/
    CalDAVTester/trunk/Resource/clients/
    CalDAVTester/trunk/buildperformance/
    CalDAVTester/trunk/buildperformer.py
    CalDAVTester/trunk/fsusage.py
    CalDAVTester/trunk/loader.py
    CalDAVTester/trunk/memusage.py
    CalDAVTester/trunk/monitor/
    CalDAVTester/trunk/monitor.py
    CalDAVTester/trunk/multiloader.py
    CalDAVTester/trunk/performance/
    CalDAVTester/trunk/performer.py
    CalDAVTester/trunk/scripts/buildperformance/
    CalDAVTester/trunk/scripts/clients/
    CalDAVTester/trunk/scripts/monitoring/
    CalDAVTester/trunk/scripts/performance/
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostauto.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurcancel.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurrequest.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurspecial.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostnormal.xml
    CalDAVTester/trunk/src/monitorinfo.py
    CalDAVTester/trunk/src/multithread.py
    CalDAVTester/trunk/src/perfinfo.py
    CalDAVTester/trunk/src/sendemail.py

Modified: CalDAVTester/trunk/Resource/CalDAV/acls/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/acls/16.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/acls/16.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842--2344 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/acls/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/acls/17.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/acls/17.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VEVENT
 DTSTAMP:20060313T145240Z
-DTSTART:20060313T145240Z
+DTSTART:$now.year.1:0313T145240Z
 SUMMARY:Event #1
 UID:961FBB7850529AAA6195464A--2345 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-1 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-1 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
@@ -11,7 +11,7 @@
 X-WR-ALARMUID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
 UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
 DESCRIPTION:Event reminder
-ACKNOWLEDGED:20111128T175238Z
+ACKNOWLEDGED:$now.year.1:1128T175238Z
 TRIGGER:-PT8M
 ACTION:DISPLAY
 END:VALARM

Modified: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-2 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-2 at example.com
-DTSTART:20110427T120000Z
+DTSTART:$now.year.1:0427T120000Z
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 2
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:put-2 at example.com
-RECURRENCE-ID:20110427T120000Z
-DTSTART:20110427T120000Z
+RECURRENCE-ID:$now.year.1:0427T120000Z
+DTSTART:$now.year.1:0427T120000Z
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 2
@@ -27,7 +27,7 @@
 X-WR-ALARMUID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
 UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
 DESCRIPTION:Event reminder
-ACKNOWLEDGED:20111128T175238Z
+ACKNOWLEDGED:$now.year.1:1128T175238Z
 TRIGGER:-PT8M
 ACTION:DISPLAY
 END:VALARM

Modified: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-3 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 3
@@ -11,7 +11,7 @@
 X-WR-ALARMUID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
 UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
 DESCRIPTION:Event reminder
-ACKNOWLEDGED:20111128T175238
+ACKNOWLEDGED:$now.year.1:1128T175238
 TRIGGER:-PT8M
 ACTION:DISPLAY
 END:VALARM

Modified: CalDAVTester/trunk/Resource/CalDAV/attachments/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/attachments/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/attachments/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,21 +7,21 @@
 TZID:America/Vancouver
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
-DTSTART:20060402T100000
+DTSTART:20050402T100000
 TZNAME:PDT
 TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0700
-DTSTART:20061029T020000
+DTSTART:20051029T020000
 TZNAME:PST
 TZOFFSETTO:-0800
 END:STANDARD
 END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:New Event
-DTEND;TZID=America/Vancouver:20060709T143000
-DTSTART;TZID=America/Vancouver:20060709T133000
+DURATION:PT1H
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T133000
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-1
 ATTACH;FMTTYPE=image/jpeg;ENCODING=BASE64;VALUE=BINARY:

Modified: CalDAVTester/trunk/Resource/CalDAV/attachments/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/attachments/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/attachments/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,21 +7,21 @@
 TZID:America/Vancouver
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
-DTSTART:20060402T100000
+DTSTART:20050402T100000
 TZNAME:PDT
 TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0700
-DTSTART:20061029T020000
+DTSTART:20051029T020000
 TZNAME:PST
 TZOFFSETTO:-0800
 END:STANDARD
 END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:New Event
-DTEND;TZID=America/Vancouver:20060709T143000
-DTSTART;TZID=America/Vancouver:20060709T133000
+DURATION:PT1H
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T133000
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-3
 ATTACH:http://www.example.com/test.jpg

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,23 +24,23 @@
 ORGANIZER:mailto:bernard at example.com
 UID:20061005T133225Z-00001-availability at example.com
 DTSTAMP:20061005T133225Z
-DTSTART;TZID=America/Montreal:20060101T000000
-DTEND;TZID=America/Montreal:20060108T000000
+DTSTART;TZID=America/Montreal:$now.year.1:0101T000000
+DTEND;TZID=America/Montreal:$now.year.1:0108T000000
 BEGIN:AVAILABLE
 UID:20061005T133225Z-00001-A-availability at example.com
 DTSTAMP:20061005T133225Z
 SUMMARY:Monday, Wednesday and Friday from 9:00 to 12:00
-DTSTART;TZID=America/Montreal:20060102T090000
-DTEND;TZID=America/Montreal:20060102T120000
+DTSTART;TZID=America/Montreal:$now.year.1:0102T090000
+DTEND;TZID=America/Montreal:$now.year.1:0102T120000
 RRULE:FREQ=WEEKLY;BYDAY=MO,WE,FR
 END:AVAILABLE
 BEGIN:AVAILABLE
 UID:20061005T133225Z-00001-A-availability at example.com
-RECURRENCE-ID;TZID=America/Montreal:20060106T090000
+RECURRENCE-ID;TZID=America/Montreal:$now.year.1:0106T090000
 DTSTAMP:20061005T133225Z
 SUMMARY:Friday override from 12:00 to 17:00
-DTSTART;TZID=America/Montreal:20060106T120000
-DTEND;TZID=America/Montreal:20060106T170000
+DTSTART;TZID=America/Montreal:$now.year.1:0106T120000
+DTEND;TZID=America/Montreal:$now.year.1:0106T170000
 END:AVAILABLE
 END:VAVAILABILITY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/10.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/10.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/10.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,10 +7,10 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T050000Z" end="20060105T000000Z"/>
+<C:time-range start="$now.year.1:0101T050000Z" end="$now.year.1:0105T000000Z"/>
 </C:comp-filter>
 <C:comp-filter name="VAVAILABILITY">
-<C:time-range start="20060101T050000Z" end="20060105T000000Z"/>
+<C:time-range start="$now.year.1:0101T050000Z" end="$now.year.1:0105T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/11.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/11.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/11.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<C:time-range start="20060101T000000Z" end="20060105T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0105T000000Z"/>
 </C:free-busy-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/12.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/12.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/12.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<C:time-range start="20060104T000000Z" end="20060108T000000Z"/>
+<C:time-range start="$now.year.1:0104T000000Z" end="$now.year.1:0108T000000Z"/>
 </C:free-busy-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/13.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/13.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/13.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<C:time-range start="20050501T000000Z" end="20050508T000000Z"/>
+<C:time-range start="$now.year.0:0501T000000Z" end="$now.year.0:0508T000000Z"/>
 </C:free-busy-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/14.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/14.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/14.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<C:time-range start="20061001T000000Z" end="20061008T000000Z"/>
+<C:time-range start="$now.year.1:1001T000000Z" end="$now.year.1:1008T000000Z"/>
 </C:free-busy-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/17.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/17.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/17.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -28,13 +28,13 @@
 ORGANIZER:mailto:bernard at example.com
 UID:20061005T133225Z-00002-availability at example.com
 DTSTAMP:20061005T133225Z
-DTSTART;TZID=America/Montreal:20050101T000000
+DTSTART;TZID=America/Montreal:$now.year.0:0101T000000
 BEGIN:AVAILABLE
 UID:20061005T133225Z-00001-A-availability at example.com
 DTSTAMP:20061005T133225Z
 SUMMARY:Monday to Friday from 9:00 to 17:00
-DTSTART;TZID=America/Montreal:20050103T090000
-DTEND;TZID=America/Montreal:20050103T170000
+DTSTART;TZID=America/Montreal:$now.year.0:0103T090000
+DTEND;TZID=America/Montreal:$now.year.0:0103T170000
 RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR
 END:AVAILABLE
 END:VAVAILABILITY

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/19.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/19.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,8 +7,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1::$cuaddr1:
-DTSTART:20060102T000000Z
+DTSTART:$now.year.1:0102T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
+DTEND:$now.year.1:0103T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,13 +24,13 @@
 ORGANIZER:mailto:bernard at example.com
 UID:20061005T133225Z-00002-availability at example.com
 DTSTAMP:20061005T133225Z
-DTEND;TZID=America/Montreal:20060101T000000
+DTEND;TZID=America/Montreal:$now.year.1:0101T000000
 BEGIN:AVAILABLE
 UID:20061005T133225Z-00001-A-availability at example.com
 DTSTAMP:20061005T133225Z
 SUMMARY:Monday to Friday from 9:00 to 17:00
-DTSTART;TZID=America/Montreal:20050103T090000
-DTEND;TZID=America/Montreal:20050103T170000
+DTSTART;TZID=America/Montreal:$now.year.0:0103T090000
+DTEND;TZID=America/Montreal:$now.year.0:0103T170000
 RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR
 END:AVAILABLE
 END:VAVAILABILITY

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,13 +24,13 @@
 ORGANIZER:mailto:bernard at example.com
 UID:20061005T133225Z-00003-availability at example.com
 DTSTAMP:20061005T133225Z
-DTSTART;TZID=America/Montreal:20060108T000000
+DTSTART;TZID=America/Montreal:$now.year.1:0108T000000
 BEGIN:AVAILABLE
 UID:20061005T133225Z-00001-A-availability at example.com
 DTSTAMP:20061005T133225Z
 SUMMARY:Monday to Friday from 9:00 to 17:00
-DTSTART;TZID=America/Montreal:20060109T090000
-DTEND;TZID=America/Montreal:20060109T170000
+DTSTART;TZID=America/Montreal:$now.year.1:0109T090000
+DTEND;TZID=America/Montreal:$now.year.1:0109T170000
 RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR
 END:AVAILABLE
 END:VAVAILABILITY

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842-availability at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/5.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/5.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VAVAILABILITY">
-<C:time-range start="20050101T000000Z" end="20070101T000000Z"/>
+<C:time-range start="$now.year.0:0101T000000Z" end="$now.year.2:0101T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/6.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/6.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VAVAILABILITY">
-<C:time-range start="20050101T000000Z" end="20050201T000000Z"/>
+<C:time-range start="$now.year.0:0101T000000Z" end="$now.year.0:0201T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/7.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/7.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VAVAILABILITY">
-<C:time-range start="20060101T050000Z" end="20060105T000000Z"/>
+<C:time-range start="$now.year.1:0101T050000Z" end="$now.year.1:0105T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/8.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/8.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/8.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VAVAILABILITY">
-<C:time-range start="20060201T000000Z" end="20060301T000000Z"/>
+<C:time-range start="$now.year.1:0201T000000Z" end="$now.year.1:0301T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/availability/9.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/9.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/9.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T050000Z" end="20060105T000000Z"/>
+<C:time-range start="$now.year.1:0101T050000Z" end="$now.year.1:0105T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:20060109T090000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T090000
 DURATION:PT1H
 LOCATION:Durham
 SUMMARY:Meeting 1.1

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:20060109T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY;COUNT=4
 SUMMARY:Meeting 1.2

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -25,7 +25,7 @@
 ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr3:
 DTSTAMP:20051228T232640Z
-DTSTART;TZID=US/Eastern:20060109T111500
+DTSTART;TZID=US/Eastern:$now.year.1:0109T111500
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:Meeting 1.3

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/1/1_4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051228T234558Z
-DTSTART;TZID=US/Eastern:20060109T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T120000
 DURATION:PT1H
 SUMMARY:Meeting 1.4
 UID:DD6F8357AD2F73248F9EFDB2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:20060109T090000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T090000
 DURATION:PT1H
 LAST-MODIFIED:20051229T031237Z
 LOCATION:Durham

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:20060109T090000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T090000
 DURATION:PT1H
 LAST-MODIFIED:20051229T031253Z
 LOCATION:Seattle bis

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:20060110T090000
+DTSTART;TZID=US/Eastern:$now.year.1:0110T090000
 DURATION:PT1H
 LAST-MODIFIED:20051229T031307Z
 LOCATION:Seattle bis

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;ROLE=CHAIR:$cuaddr1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
 DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:20060110T090000
+DTSTART;TZID=US/Eastern:$now.year.1:0110T090000
 DURATION:PT1H
 LAST-MODIFIED:20051229T031335Z
 LOCATION:Seattle bis

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;ROLE=CHAIR:$cuaddr1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
 DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:20060110T090000
+DTSTART;TZID=US/Eastern:$now.year.1:0110T090000
 DURATION:PT1H
 LAST-MODIFIED:20051229T031502Z
 LOCATION:Seattle bis

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_6.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_6.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_6.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:20060109T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
 DURATION:PT1H
 LAST-MODIFIED:20051229T031626Z
 RRULE:FREQ=WEEKLY;COUNT=4
@@ -32,12 +32,12 @@
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:20060109T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
 DURATION:PT1H
 LAST-MODIFIED:20051229T031626Z
 SEQUENCE:1
 SUMMARY:Meeting 1.2bis
 UID:BFA4438181922A64663219C5 at ninevah.local
-RECURRENCE-ID:20060109T150000Z
+RECURRENCE-ID:$now.year.1:0109T150000Z
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -25,7 +25,7 @@
 ATTENDEE;PARTSTAT=DECLINED;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr3:
 DTSTAMP:20051228T232640Z
-DTSTART;TZID=US/Eastern:20060109T111500
+DTSTART;TZID=US/Eastern:$now.year.1:0109T111500
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_8.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_8.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_8.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:20060109T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
 DURATION:PT1H
-EXDATE;TZID=US/Eastern:20060130T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0130T100000
 LAST-MODIFIED:20051229T031649Z
 RRULE:FREQ=WEEKLY;COUNT=4
 SEQUENCE:2
@@ -33,12 +33,12 @@
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:20060109T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
 DURATION:PT1H
 LAST-MODIFIED:20051229T031626Z
 SEQUENCE:2
 SUMMARY:Meeting 1.2bis
 UID:BFA4438181922A64663219C5 at ninevah.local
-RECURRENCE-ID:20060109T150000Z
+RECURRENCE-ID:$now.year.1:0109T150000Z
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_9.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_9.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_9.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;ROLE=CHAIR:$cuaddr1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
 DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:20060110T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0110T120000
 DURATION:PT1H
 LAST-MODIFIED:20051229T031502Z
 LOCATION:Seattle bis

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051229T035051Z
-DTSTART;TZID=US/Eastern:20060109T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T110000
 DURATION:PT1H
 SUMMARY:Meeting 4.1
 UID:DD24C5FA3FBF079338E32BB8 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051229T035131Z
-DTSTART;TZID=US/Eastern:20060109T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Meeting 4.2

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051229T035241Z
-DTSTART;TZID=US/Eastern:20060109T130000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T130000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Meeting 4.3
@@ -30,9 +30,9 @@
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051229T035241Z
-DTSTART;TZID=US/Eastern:20060110T130000
+DTSTART;TZID=US/Eastern:$now.year.1:0110T130000
 DURATION:PT2H
-RECURRENCE-ID:20060110T180000Z
+RECURRENCE-ID:$now.year.1:0110T180000Z
 SUMMARY:Meeting 4.3
 UID:7E7050FDBF385B60BF088384 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_4a.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_4a.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_4a.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051229T035317Z
-DTSTART;TZID=US/Eastern:20060109T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T140000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Meeting 4.4

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_4b.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_4b.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_4b.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051229T035317Z
-DTSTART;TZID=US/Eastern:20060109T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T140000
 DURATION:PT1H
-EXDATE;TZID=US/Eastern:20060110T140000
+EXDATE;TZID=US/Eastern:$now.year.1:0110T140000
 LAST-MODIFIED:20051229T035328Z
 RRULE:FREQ=DAILY;COUNT=5
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_5a.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_5a.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_5a.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051229T035352Z
-DTSTART;TZID=US/Eastern:20060109T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T150000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Meeting 4.5
@@ -30,9 +30,9 @@
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051229T035352Z
-DTSTART;TZID=US/Eastern:20060110T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0110T150000
 DURATION:PT2H
-RECURRENCE-ID:20060110T200000Z
+RECURRENCE-ID:$now.year.1:0110T200000Z
 SUMMARY:Meeting 4.5
 UID:18DE3CD69992147228F534CC at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_5b.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_5b.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/4/4_5b.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051229T035352Z
-DTSTART;TZID=US/Eastern:20060109T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T150000
 DURATION:PT1H
-EXDATE;TZID=US/Eastern:20060110T150000
+EXDATE;TZID=US/Eastern:$now.year.1:0110T150000
 LAST-MODIFIED:20051229T035404Z
 RRULE:FREQ=DAILY;COUNT=5
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/copymove/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/copymove/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/copymove/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/copymove/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/copymove/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/copymove/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T210052Z
-DTSTART;TZID=US/Mountain:20060101T110000
+DTSTART;TZID=US/Mountain:$now.year.1:0101T110000
 DURATION:PT1H
 SUMMARY:event 2
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/copymove/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/copymove/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/copymove/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T210146Z
-DTSTART;TZID=US/Pacific:20060101T130000
+DTSTART;TZID=US/Pacific:$now.year.1:0101T130000
 DURATION:PT1H
 LAST-MODIFIED:20051222T210203Z
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/copymove/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/copymove/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/copymove/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T210310Z
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 SUMMARY:event 4
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/copymove/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/copymove/5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/copymove/5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842-5 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/copymove/6.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/copymove/6.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/copymove/6.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T210052Z
-DTSTART;TZID=US/Mountain:20060101T110000
+DTSTART;TZID=US/Mountain:$now.year.1:0101T110000
 DURATION:PT1H
 SUMMARY:event 2
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/ctag/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/ctag/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/ctag/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local-1

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/implicit/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-1 at example.com
-DTSTART:20110427T000000Z
+DTSTART:$now.year.1:0427T000000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-1 at example.com
-DTSTART:20110427T000000Z
+DTSTART:$now.year.1:0427T000000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-2 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-4 at example.com
-DTSTART:20110427T000000Z
+DTSTART:$now.year.1:0427T000000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 4
@@ -11,8 +11,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:put-4 at example.com
-RECURRENCE-ID:20110428T000000Z
-DTSTART:20110428T010000Z
+RECURRENCE-ID:$now.year.1:0428T000000Z
+DTSTART:$now.year.1:0428T010000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 4.2

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-4 at example.com
-DTSTART:20110427T000000Z
+DTSTART:$now.year.1:0427T000000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 4
@@ -18,8 +18,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:put-4 at example.com
-RECURRENCE-ID:20110428T000000Z
-DTSTART:20110428T010000Z
+RECURRENCE-ID:$now.year.1:0428T000000Z
+DTSTART:$now.year.1:0428T010000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 4.2

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-5 at example.com
-DTSTART:20110427T000000Z
+DTSTART:$now.year.1:0427T000000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 5

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-9 at example.com
-DTSTART:20110427T000000Z
+DTSTART:$now.year.1:0427T000000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 9

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-1 at example.com
-DTSTART:20110427T000000Z
+DTSTART:$now.year.1:0427T000000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-1 at example.com
-DTSTART:20110427T000000Z
+DTSTART:$now.year.1:0427T000000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-2 at example.com
-DTSTART:20110427T080000Z
+DTSTART:$now.year.1:0427T080000Z
 DURATION:P1DT
 DTSTAMP:20110427T000000Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/delete/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/delete/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/delete/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/delete/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/delete/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/delete/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T210052Z
-DTSTART;TZID=US/Mountain:20060101T110000
+DTSTART;TZID=US/Mountain:$now.year.1:0101T110000
 DURATION:PT1H
 SUMMARY:event 2
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/delete/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/delete/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/delete/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T210146Z
-DTSTART;TZID=US/Pacific:20060101T130000
+DTSTART;TZID=US/Pacific:$now.year.1:0101T130000
 DURATION:PT1H
 LAST-MODIFIED:20051222T210203Z
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/delete/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/delete/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/delete/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T210310Z
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 SUMMARY:event 4
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T010000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T010000
 DURATION:PT1H
 SUMMARY:event 1
 UID:1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T030000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T030000
 DURATION:PT1H
 SUMMARY:event 2
 UID:2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T050000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T050000
 DURATION:PT1H
 SUMMARY:event 3
 UID:3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T070000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T070000
 DURATION:PT1H
 SUMMARY:event 4
 UID:4 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T090000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T090000
 DURATION:PT1H
 SUMMARY:event 5
 UID:5 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T110000
 DURATION:PT1H
 SUMMARY:event 6
 UID:6 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T130000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T130000
 DURATION:PT1H
 SUMMARY:event 7
 UID:7 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T150000
 DURATION:PT1H
 SUMMARY:event 8
 UID:8 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/depthreportsacl/cal9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T170000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T170000
 DURATION:PT1H
 SUMMARY:event 9
 UID:9 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/dropbox/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/dropbox/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/dropbox/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/dropbox/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/dropbox/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/dropbox/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/dropbox/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/dropbox/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/dropbox/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/dropbox/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/dropbox/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/dropbox/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/26.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/26.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/26.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -36,7 +36,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART;TZID="US/Eastern":20060101T000000
+DTSTART;TZID="US/Eastern":$now.year.1:0101T000000
 DTEND;TZID="US/Eastern":20060102T000000
 SUMMARY:event 1
 UID:event1 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/27.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/27.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/27.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -27,7 +27,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART;TZID="US/Eastern":20060101T000000
+DTSTART;TZID="US/Eastern":$now.year.1:0101T000000
 DTEND;TZID="US/Eastern":20060102T000000
 SUMMARY:event 1
 UID:event1 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/28.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/28.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/28.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,7 +5,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,14 +23,14 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
 END:VEVENT
 BEGIN:VFREEBUSY
 DTSTAMP:20051222T205953Z
-DTSTART:20060108T050000Z
+DTSTART:$now.year.1:0108T050000Z
 DTEND:20060109T050000Z
 FREEBUSY:20060108T163000Z/PT1H30M,20060108T190000Z/PT30M
 FREEBUSY;FBTYPE="BUSY-UNAVAILABLE":20060108T130000Z/PT2H

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/33.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/33.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/33.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=MONTHLY;BYDAY=+1,3MO
 SUMMARY:event 1-%ctr

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/34.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/34.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/34.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=10
 SUMMARY:event 34
@@ -32,18 +32,18 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 34-2
 UID:54E181BC7CCC373042B28842-34 at ninevah.local
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 34-3
 UID:54E181BC7CCC373042B28842-34 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/35.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/35.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/35.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -8,7 +8,7 @@
 ORGANIZER;CN=$username1::urn:uuid:bogus-uuid
 ATTENDEE;CN=$username2::$cuaddr2:
 ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060102T000000Z
 END:VFREEBUSY

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/36.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/36.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/36.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 36
 DESCRIPTION:Bad \"escaping\" here.

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/37.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/37.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/37.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 37
 DESCRIPTION:Bad recurrence components
@@ -32,11 +32,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T110000
 DURATION:PT1H
 SUMMARY:event 37
 DESCRIPTION:Bad recurrence components
 UID:54E181BC7CCC373042B28842-37 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/38.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/38.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,17 +23,17 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T110000
 DURATION:PT1H
 SUMMARY:event 38
 DESCRIPTION:Bad recurrence components
 UID:54E181BC7CCC373042B28842-38 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 38
 DESCRIPTION:Bad recurrence components

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/39.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/39.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/39.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 39
 DESCRIPTION:Too many attendees

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/40.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/40.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/40.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY
 SUMMARY:event 39
@@ -33,9 +33,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060109T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0109T150000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060109T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0109T100000
 SUMMARY:event 39
 DESCRIPTION:Too many attendees
 UID:54E181BC7CCC373042B28842-40 at ninevah.local
@@ -43,9 +43,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060116T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0116T150000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060116T160000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0116T160000
 SUMMARY:event 39
 DESCRIPTION:Too many attendees
 UID:54E181BC7CCC373042B28842-40 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/42.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/42.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/42.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210507Z
 CREATED:20060102T190000Z
-DTSTART;TZID=US/Eastern:20060102T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T140000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 6
@@ -32,9 +32,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210507Z
 UID:F5B811E00073B22BA6B87551-brokeit at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T140000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T140000
 CREATED:20060102T190000Z
-DTSTART;TZID=US/Eastern:20060104T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T160000
 DURATION:PT1H
 SUMMARY:event 6 changed
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210052Z
 CREATED:20060101T160000Z
-DTSTART;TZID=US/Mountain:20060101T110000
+DTSTART;TZID=US/Mountain:$now.year.1:0101T110000
 DURATION:PT1H
 SUMMARY:event 2
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 RRULE:FREQ=SECONDLY;COUNT=2000
 DURATION:PT1H
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/errors/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/errors/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/errors/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 RRULE:FREQ=SECONDLY;COUNT=2000
 DURATION:PT1H
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T050000Z" end="20060102T050000Z"/>
+<C:time-range start="$now.year.1:0101T050000Z" end="$now.year.1:0102T050000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T080000Z" end="20060102T080000Z"/>
+<C:time-range start="$now.year.1:0101T080000Z" end="$now.year.1:0102T080000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T050000Z" end="20060102T050000Z"/>
+<C:time-range start="$now.year.1:0101T050000Z" end="$now.year.1:0102T050000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 </C:free-busy-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/6.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/6.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
   <prop xmlns='DAV:'>
     <getetag/>
     <calendar-data xmlns='urn:ietf:params:xml:ns:caldav'>
-      <expand start='20060101T090000Z' end='20060108T090000Z'/>
+      <expand start='$now.year.1:0101T090000Z' end='$now.year.1:0108T090000Z'/>
       <comp name='VCALENDAR'>
         <allprop/>
         <comp name='VEVENT'>
@@ -31,7 +31,7 @@
   <filter>
     <comp-filter name='VCALENDAR'>
       <comp-filter name='VEVENT'>
-        <time-range start='20060101T090000Z' end='20060108T090000Z'/>
+        <time-range start='$now.year.1:0101T090000Z' end='$now.year.1:0108T090000Z'/>
       </comp-filter>
     </comp-filter>
   </filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -6,11 +6,11 @@
 SEQUENCE:5
 TRANSP:OPAQUE
 UID:0C06C15F-5F06-4DEF-8902-242426BE61D0
-DTSTART:20080902T090000
+DTSTART:$now.year.3:0902T090000
 DTSTAMP:20080902T203821Z
 SUMMARY:New Event
 CREATED:20080902T203804Z
-DTEND:20080902T100000
-RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20080905T235959Z
+DTEND:$now.year.3:0902T100000
+RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=$now.year.3:0905T235959Z
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/put/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,7 +5,7 @@
 X-WR-CALNAME:CalDAV tests
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 SUMMARY:event 1
 UID:event1 at example.local
 STATUS:TENTATIVE

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/put/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,7 +5,7 @@
 X-WR-CALNAME:CalDAV tests
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 SUMMARY:event 2
 UID:event2 at example.local
 STATUS:TENTATIVE

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/put/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,8 +5,8 @@
 X-WR-CALNAME:CalDAV tests
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART:20060101T010000
-DTEND:20060101T020000
+DTSTART:$now.year.1:0101T010000
+DTEND:$now.year.1:0101T020000
 SUMMARY:event 3
 UID:event3 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/put/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,8 +5,8 @@
 X-WR-CALNAME:CalDAV tests
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART:20060102T010000
-DTEND:20060102T020000
+DTSTART:$now.year.1:0102T010000
+DTEND:$now.year.1:0102T020000
 SUMMARY:event 4
 UID:event4 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/put/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,8 +23,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART;TZID="US/Eastern":20060101T000000
-DTEND;TZID="US/Eastern":20060101T010000
+DTSTART;TZID="US/Eastern":$now.year.1:0101T000000
+DTEND;TZID="US/Eastern":$now.year.1:0101T010000
 SUMMARY:event 5
 UID:event5 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/put/6.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/6.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/6.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,8 +23,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART;TZID="US/Pacific":20060101T000000
-DTEND;TZID="US/Pacific":20060101T010000
+DTSTART;TZID="US/Pacific":$now.year.1:0101T000000
+DTEND;TZID="US/Pacific":$now.year.1:0101T010000
 SUMMARY:event 6
 UID:event6 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/floating/put/7.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/7.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/7.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,8 +23,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART;TZID="GMT":20060101T000000
-DTEND;TZID="GMT":20060101T010000
+DTSTART;TZID="GMT":$now.year.1:0101T000000
+DTEND;TZID="GMT":$now.year.1:0101T010000
 SUMMARY:event 7
 UID:event7 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/get/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/get/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/get/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,14 +21,14 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 4

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=ACCEPTED:$cuaddr2:
@@ -33,8 +33,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060108
-RECURRENCE-ID;VALUE=DATE:20060108
+DTSTART;VALUE=DATE:$now.year.1:0108
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0108
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=DECLINED:$cuaddr2:
 CREATED:20060101T151000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
@@ -33,8 +33,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060108
-RECURRENCE-ID;VALUE=DATE:20060108
+DTSTART;VALUE=DATE:$now.year.1:0108
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0108
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060108
-RECURRENCE-ID;VALUE=DATE:20060108
+DTSTART;VALUE=DATE:$now.year.1:0108
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0108
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0:$cuaddr2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060108
-RECURRENCE-ID;VALUE=DATE:20060108
+DTSTART;VALUE=DATE:$now.year.1:0108
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0108
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060108
-RECURRENCE-ID;VALUE=DATE:20060108
+DTSTART;VALUE=DATE:$now.year.1:0108
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0108
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/recurring/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 RRULE:FREQ=WEEKLY;COUNT=10
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060108
-RECURRENCE-ID;VALUE=DATE:20060108
+DTSTART;VALUE=DATE:$now.year.1:0108
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0108
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T151000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/allday/simple/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 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/trunk/Resource/CalDAV/implicit/auto1/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite1/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;
  EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite2/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 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/trunk/Resource/CalDAV/implicit/auto1/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite3/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060206T200000Z
-DTEND:20060206T210000Z
+DTSTART:$now.year.1:0206T200000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060206T200000Z
-DTEND:20060206T210000Z
+DTSTART:$now.year.1:0206T200000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
@@ -19,9 +19,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:20060208T200000Z
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+RECURRENCE-ID:$now.year.1:0208T200000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 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/trunk/Resource/CalDAV/implicit/auto1/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060206T200000Z
-DTEND:20060206T210000Z
+DTSTART:$now.year.1:0206T200000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -19,9 +19,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:20060208T200000Z
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+RECURRENCE-ID:$now.year.1:0208T200000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite4/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060206T200000Z
-DTEND:20060206T210000Z
+DTSTART:$now.year.1:0206T200000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -19,9 +19,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:20060208T200000Z
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+RECURRENCE-ID:$now.year.1:0208T200000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060206T100000Z
-DTEND:20060206T110000Z
+DTSTART:$now.year.1:0206T100000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060206T100000Z
-DTEND:20060206T110000Z
+DTSTART:$now.year.1:0206T100000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060206T100000Z
-DTEND:20060206T110000Z
+DTSTART:$now.year.1:0206T100000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite5/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060206T100000Z
-DTEND:20060206T110000Z
+DTSTART:$now.year.1:0206T100000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:20060210T104500Z
-DTEND:20060210T114500Z
+DTSTART:$now.year.1:0210T104500Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:20060210T104500Z
-DTEND:20060210T114500Z
+DTSTART:$now.year.1:0210T104500Z
+DURATION:PT1H
 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/trunk/Resource/CalDAV/implicit/auto1/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:20060210T104500Z
-DTEND:20060210T114500Z
+DTSTART:$now.year.1:0210T104500Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite6/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:20060210T104500Z
-DTEND:20060210T114500Z
+DTSTART:$now.year.1:0210T104500Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:20060210T080000Z
-DTEND:20060210T081000Z
+DTSTART:$now.year.1:0210T080000Z
+DURATION:PT1H
 RRULE:FREQ=HOURLY;COUNT=8
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:20060210T080000Z
-DTEND:20060210T081000Z
+DTSTART:$now.year.1:0210T080000Z
+DURATION:PT1H
 RRULE:FREQ=HOURLY;COUNT=8
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
@@ -19,9 +19,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-6
-RECURRENCE-ID:20060210T100000Z
-DTSTART:20060210T100000Z
-DTEND:20060210T101000Z
+RECURRENCE-ID:$now.year.1:0210T100000Z
+DTSTART:$now.year.1:0210T100000Z
+DURATION:PT1H
 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/trunk/Resource/CalDAV/implicit/auto1/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:20060210T080000Z
-DTEND:20060210T081000Z
+DTSTART:$now.year.1:0210T080000Z
+DURATION:PT1H
 RRULE:FREQ=HOURLY;COUNT=8
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -19,9 +19,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-6
-RECURRENCE-ID:20060210T100000Z
-DTSTART:20060210T100000Z
-DTEND:20060210T101000Z
+RECURRENCE-ID:$now.year.1:0210T100000Z
+DTSTART:$now.year.1:0210T100000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite7/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:20060210T080000Z
-DTEND:20060210T081000Z
+DTSTART:$now.year.1:0210T080000Z
+DURATION:PT1H
 RRULE:FREQ=HOURLY;COUNT=8
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -19,9 +19,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-6
-RECURRENCE-ID:20060210T100000Z
-DTSTART:20060210T100000Z
-DTEND:20060210T101000Z
+RECURRENCE-ID:$now.year.1:0210T100000Z
+DTSTART:$now.year.1:0210T100000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite8/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite8/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto1/suite8/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060215T210000Z
-DTEND:20060215T220000Z
-RECURRENCE-ID:20060215T200000Z
+DTSTART:$now.year.1:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060215T210000Z
-DTEND:20060215T220000Z
-RECURRENCE-ID:20060215T200000Z
+DTSTART:$now.year.1:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite2/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 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-1
-DTSTART:20060215T210000Z
-DTEND:20060215T220000Z
-RECURRENCE-ID:20060215T200000Z
+DTSTART:$now.year.1:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060215T210000Z
-DTEND:20060215T220000Z
-RECURRENCE-ID:20060215T200000Z
+DTSTART:$now.year.1:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T200000Z
 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:20060222T210000Z
-DTEND:20060222T220000Z
-RECURRENCE-ID:20060222T200000Z
+DTSTART:$now.year.1:0222T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0222T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060215T210000Z
-DTEND:20060215T220000Z
-RECURRENCE-ID:20060215T200000Z
+DTSTART:$now.year.1:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T200000Z
 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:20060222T210000Z
-DTEND:20060222T220000Z
-RECURRENCE-ID:20060222T200000Z
+DTSTART:$now.year.1:0222T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0222T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite3/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 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-1
-DTSTART:20060215T210000Z
-DTEND:20060215T220000Z
-RECURRENCE-ID:20060215T200000Z
+DTSTART:$now.year.1:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T200000Z
 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:20060222T210000Z
-DTEND:20060222T220000Z
-RECURRENCE-ID:20060222T200000Z
+DTSTART:$now.year.1:0222T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0222T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T100000Z
-DTEND:20060208T110000Z
+DTSTART:$now.year.1:0208T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -16,9 +16,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060215T110000Z
-DTEND:20060215T120000Z
-RECURRENCE-ID:20060215T100000Z
+DTSTART:$now.year.1:0215T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T100000Z
-DTEND:20060208T110000Z
+DTSTART:$now.year.1:0208T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -16,9 +16,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060215T110000Z
-DTEND:20060215T120000Z
-RECURRENCE-ID:20060215T100000Z
+DTSTART:$now.year.1:0215T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite4/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,9 +3,9 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060215T110000Z
-DTEND:20060215T120000Z
-RECURRENCE-ID:20060215T100000Z
+DTSTART:$now.year.1:0215T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T100000Z
-DTEND:20060208T110000Z
+DTSTART:$now.year.1:0208T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060215T110000Z
-DTEND:20060215T120000Z
-RECURRENCE-ID:20060215T100000Z
+DTSTART:$now.year.1:0215T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T100000Z
 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:20060222T110000Z
-DTEND:20060222T120000Z
-RECURRENCE-ID:20060222T100000Z
+DTSTART:$now.year.1:0222T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0222T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T100000Z
-DTEND:20060208T110000Z
+DTSTART:$now.year.1:0208T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060215T110000Z
-DTEND:20060215T120000Z
-RECURRENCE-ID:20060215T100000Z
+DTSTART:$now.year.1:0215T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T100000Z
 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:20060222T110000Z
-DTEND:20060222T120000Z
-RECURRENCE-ID:20060222T100000Z
+DTSTART:$now.year.1:0222T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0222T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite5/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,9 +3,9 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060215T110000Z
-DTEND:20060215T120000Z
-RECURRENCE-ID:20060215T100000Z
+DTSTART:$now.year.1:0215T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T100000Z
 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:20060222T110000Z
-DTEND:20060222T120000Z
-RECURRENCE-ID:20060222T100000Z
+DTSTART:$now.year.1:0222T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0222T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T100000Z
-DTEND:20060208T110000Z
+DTSTART:$now.year.1:0208T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060215T110000Z
-DTEND:20060215T120000Z
-RECURRENCE-ID:20060215T100000Z
+DTSTART:$now.year.1:0215T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T100000Z
 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:20060222T203000Z
-DTEND:20060222T213000Z
-RECURRENCE-ID:20060222T100000Z
+DTSTART:$now.year.1:0222T203000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0222T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T100000Z
-DTEND:20060208T110000Z
+DTSTART:$now.year.1:0208T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060215T110000Z
-DTEND:20060215T120000Z
-RECURRENCE-ID:20060215T100000Z
+DTSTART:$now.year.1:0215T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T100000Z
 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:20060222T203000Z
-DTEND:20060222T213000Z
-RECURRENCE-ID:20060222T100000Z
+DTSTART:$now.year.1:0222T203000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0222T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite6/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,9 +3,9 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060215T110000Z
-DTEND:20060215T120000Z
-RECURRENCE-ID:20060215T100000Z
+DTSTART:$now.year.1:0215T110000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0215T100000Z
 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:20060222T203000Z
-DTEND:20060222T213000Z
-RECURRENCE-ID:20060222T100000Z
+DTSTART:$now.year.1:0222T203000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0222T100000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070208T200000Z
-DTEND:20070208T210000Z
+DTSTART:$now.year.2:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20070110T231240Z
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070215T210000Z
-DTEND:20070215T220000Z
-RECURRENCE-ID:20070215T200000Z
+DTSTART:$now.year.2:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.2:0215T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070208T200000Z
-DTEND:20070208T210000Z
+DTSTART:$now.year.2:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070215T210000Z
-DTEND:20070215T220000Z
-RECURRENCE-ID:20070215T200000Z
+DTSTART:$now.year.2:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.2:0215T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite7/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070208T200000Z
-DTEND:20070208T210000Z
+DTSTART:$now.year.2:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
@@ -12,7 +12,7 @@
 DTSTAMP:20070309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20070215T200000Z
+EXDATE:$now.year.2:0215T200000Z
 SUMMARY:Recurring event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070208T200000Z
-DTEND:20070208T210000Z
+DTSTART:$now.year.2:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20070110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070215T210000Z
-DTEND:20070215T220000Z
-RECURRENCE-ID:20070215T200000Z
+DTSTART:$now.year.2:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.2:0215T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070222T210000Z
-DTEND:20070222T220000Z
-RECURRENCE-ID:20070222T200000Z
+DTSTART:$now.year.2:0222T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.2:0222T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070208T200000Z
-DTEND:20070208T210000Z
+DTSTART:$now.year.2:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070215T210000Z
-DTEND:20070215T220000Z
-RECURRENCE-ID:20070215T200000Z
+DTSTART:$now.year.2:0215T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.2:0215T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070222T210000Z
-DTEND:20070222T220000Z
-RECURRENCE-ID:20070222T200000Z
+DTSTART:$now.year.2:0222T210000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.2:0222T200000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto2/suite8/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20070208T200000Z
-DTEND:20070208T210000Z
+DTSTART:$now.year.2:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
@@ -12,8 +12,8 @@
 DTSTAMP:20070309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20070215T200000Z
-EXDATE:20070222T200000Z
+EXDATE:$now.year.2:0215T200000Z
+EXDATE:$now.year.2:0222T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -12,7 +12,7 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060215T200000Z
+EXDATE:$now.year.1:0215T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -12,7 +12,7 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060215T200000Z
+EXDATE:$now.year.1:0215T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite2/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -12,7 +12,7 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060215T200000Z
+EXDATE:$now.year.1:0215T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -12,8 +12,8 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060215T200000Z
-EXDATE:20060308T200000Z,20060322T200000Z,20060405T200000Z
+EXDATE:$now.year.1:0215T200000Z
+EXDATE:$now.year.1:0308T200000Z,20060322T200000Z,20060405T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -12,8 +12,8 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060215T200000Z
-EXDATE:20060308T200000Z,20060322T200000Z,20060405T200000Z
+EXDATE:$now.year.1:0215T200000Z
+EXDATE:$now.year.1:0308T200000Z,20060322T200000Z,20060405T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite3/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -12,8 +12,8 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060215T200000Z
-EXDATE:20060308T200000Z,20060322T200000Z,20060405T200000Z
+EXDATE:$now.year.1:0215T200000Z
+EXDATE:$now.year.1:0308T200000Z,20060322T200000Z,20060405T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060209T200000Z
-DTEND:20060209T210000Z
+DTSTART:$now.year.1:0209T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -17,57 +17,57 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060216T210000Z
-DTEND:20060216T220000Z
+DTSTART:$now.year.1:0216T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060216T200000Z
+RECURRENCE-ID:$now.year.1:0216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060223T210000Z
-DTEND:20060223T220000Z
+DTSTART:$now.year.1:0223T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060223T200000Z
+RECURRENCE-ID:$now.year.1:0223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060309T210000Z
-DTEND:20060309T220000Z
+DTSTART:$now.year.1:0309T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060309T200000Z
+RECURRENCE-ID:$now.year.1:0309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060324T210000Z
-DTEND:20060324T220000Z
+DTSTART:$now.year.1:0324T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060323T200000Z
+RECURRENCE-ID:$now.year.1:0323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060209T200000Z
-DTEND:20060209T210000Z
+DTSTART:$now.year.1:0209T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -17,57 +17,57 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060216T210000Z
-DTEND:20060216T220000Z
+DTSTART:$now.year.1:0216T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060216T200000Z
+RECURRENCE-ID:$now.year.1:0216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060223T210000Z
-DTEND:20060223T220000Z
+DTSTART:$now.year.1:0223T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060223T200000Z
+RECURRENCE-ID:$now.year.1:0223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060309T210000Z
-DTEND:20060309T220000Z
+DTSTART:$now.year.1:0309T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060309T200000Z
+RECURRENCE-ID:$now.year.1:0309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060324T210000Z
-DTEND:20060324T220000Z
+DTSTART:$now.year.1:0324T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060323T200000Z
+RECURRENCE-ID:$now.year.1:0323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite4/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060209T200000Z
-DTEND:20060209T210000Z
+DTSTART:$now.year.1:0209T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -17,57 +17,57 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060216T210000Z
-DTEND:20060216T220000Z
+DTSTART:$now.year.1:0216T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060216T200000Z
+RECURRENCE-ID:$now.year.1:0216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060223T210000Z
-DTEND:20060223T220000Z
+DTSTART:$now.year.1:0223T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060223T200000Z
+RECURRENCE-ID:$now.year.1:0223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060309T210000Z
-DTEND:20060309T220000Z
+DTSTART:$now.year.1:0309T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060309T200000Z
+RECURRENCE-ID:$now.year.1:0309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060324T210000Z
-DTEND:20060324T220000Z
+DTSTART:$now.year.1:0324T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060323T200000Z
+RECURRENCE-ID:$now.year.1:0323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060209T200000Z
-DTEND:20060209T210000Z
+DTSTART:$now.year.1:0209T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -18,59 +18,59 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060216T210000Z
-DTEND:20060216T220000Z
+DTSTART:$now.year.1:0216T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060216T200000Z
+RECURRENCE-ID:$now.year.1:0216T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060223T210000Z
-DTEND:20060223T220000Z
+DTSTART:$now.year.1:0223T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060223T200000Z
+RECURRENCE-ID:$now.year.1:0223T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060309T210000Z
-DTEND:20060309T220000Z
+DTSTART:$now.year.1:0309T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060309T200000Z
+RECURRENCE-ID:$now.year.1:0309T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060324T210000Z
-DTEND:20060324T220000Z
+DTSTART:$now.year.1:0324T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060323T200000Z
+RECURRENCE-ID:$now.year.1:0323T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060209T200000Z
-DTEND:20060209T210000Z
+DTSTART:$now.year.1:0209T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -18,59 +18,59 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060216T210000Z
-DTEND:20060216T220000Z
+DTSTART:$now.year.1:0216T210000Z
+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:20060216T200000Z
+RECURRENCE-ID:$now.year.1:0216T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060223T210000Z
-DTEND:20060223T220000Z
+DTSTART:$now.year.1:0223T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060223T200000Z
+RECURRENCE-ID:$now.year.1:0223T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060309T210000Z
-DTEND:20060309T220000Z
+DTSTART:$now.year.1:0309T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060309T200000Z
+RECURRENCE-ID:$now.year.1:0309T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060324T210000Z
-DTEND:20060324T220000Z
+DTSTART:$now.year.1:0324T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060323T200000Z
+RECURRENCE-ID:$now.year.1:0323T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite5/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060209T200000Z
-DTEND:20060209T210000Z
+DTSTART:$now.year.1:0209T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -12,52 +12,52 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060216T200000Z
+EXDATE:$now.year.1:0216T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060223T210000Z
-DTEND:20060223T220000Z
+DTSTART:$now.year.1:0223T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060223T200000Z
+RECURRENCE-ID:$now.year.1:0223T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060309T210000Z
-DTEND:20060309T220000Z
+DTSTART:$now.year.1:0309T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060309T200000Z
+RECURRENCE-ID:$now.year.1:0309T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060324T210000Z
-DTEND:20060324T220000Z
+DTSTART:$now.year.1:0324T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060323T200000Z
+RECURRENCE-ID:$now.year.1:0323T200000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060209T200000Z
-DTEND:20060209T210000Z
+DTSTART:$now.year.1:0209T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -12,50 +12,50 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060223T200000Z
+EXDATE:$now.year.1:0223T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060216T210000Z
-DTEND:20060216T220000Z
+DTSTART:$now.year.1:0216T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060216T200000Z
+RECURRENCE-ID:$now.year.1:0216T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060309T210000Z
-DTEND:20060309T220000Z
+DTSTART:$now.year.1:0309T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060309T200000Z
+RECURRENCE-ID:$now.year.1:0309T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060324T210000Z
-DTEND:20060324T220000Z
+DTSTART:$now.year.1:0324T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060323T200000Z
+RECURRENCE-ID:$now.year.1:0323T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060209T200000Z
-DTEND:20060209T210000Z
+DTSTART:$now.year.1:0209T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -12,50 +12,50 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060223T200000Z
+EXDATE:$now.year.1:0223T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060216T210000Z
-DTEND:20060216T220000Z
+DTSTART:$now.year.1:0216T210000Z
+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:20060216T200000Z
+RECURRENCE-ID:$now.year.1:0216T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060309T210000Z
-DTEND:20060309T220000Z
+DTSTART:$now.year.1:0309T210000Z
+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:20060309T200000Z
+RECURRENCE-ID:$now.year.1:0309T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060324T210000Z
-DTEND:20060324T220000Z
+DTSTART:$now.year.1:0324T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=1.2;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060323T200000Z
+RECURRENCE-ID:$now.year.1:0323T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite6/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060209T200000Z
-DTEND:20060209T210000Z
+DTSTART:$now.year.1:0209T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -12,24 +12,24 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060223T200000Z
-EXDATE:20060216T200000Z
-EXDATE:20060309T200000Z
+EXDATE:$now.year.1:0223T200000Z
+EXDATE:$now.year.1:0216T200000Z
+EXDATE:$now.year.1:0309T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060324T210000Z
-DTEND:20060324T220000Z
+DTSTART:$now.year.1:0324T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060323T200000Z
+RECURRENCE-ID:$now.year.1:0323T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060209T100000Z
-DTEND:20060209T110000Z
+DTSTART:$now.year.1:0209T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -16,29 +16,29 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060216T110000Z
-DTEND:20060216T120000Z
+DTSTART:$now.year.1:0216T110000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060216T100000Z
+RECURRENCE-ID:$now.year.1:0216T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060223T110000Z
-DTEND:20060223T120000Z
+DTSTART:$now.year.1:0223T110000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060223T100000Z
+RECURRENCE-ID:$now.year.1:0223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060209T100000Z
-DTEND:20060209T110000Z
+DTSTART:$now.year.1:0209T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -16,29 +16,29 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060216T110000Z
-DTEND:20060216T120000Z
+DTSTART:$now.year.1:0216T110000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060216T100000Z
+RECURRENCE-ID:$now.year.1:0216T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060223T110000Z
-DTEND:20060223T120000Z
+DTSTART:$now.year.1:0223T110000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060223T100000Z
+RECURRENCE-ID:$now.year.1:0223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite7/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,29 +3,29 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060216T110000Z
-DTEND:20060216T120000Z
+DTSTART:$now.year.1:0216T110000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060216T100000Z
+RECURRENCE-ID:$now.year.1:0216T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060223T110000Z
-DTEND:20060223T120000Z
+DTSTART:$now.year.1:0223T110000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060223T100000Z
+RECURRENCE-ID:$now.year.1:0223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,30 +3,30 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060209T100000Z
-DTEND:20060209T110000Z
+DTSTART:$now.year.1:0209T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060216T100000Z
+EXDATE:$now.year.1:0216T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060223T110000Z
-DTEND:20060223T120000Z
+DTSTART:$now.year.1:0223T110000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1::$cuaddralt1:
-RECURRENCE-ID:20060223T100000Z
+RECURRENCE-ID:$now.year.1:0223T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,30 +3,30 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060209T100000Z
-DTEND:20060209T110000Z
+DTSTART:$now.year.1:0209T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
-EXDATE:20060216T100000Z
+EXDATE:$now.year.1:0216T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060223T110000Z
-DTEND:20060223T120000Z
+DTSTART:$now.year.1:0223T110000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060223T100000Z
+RECURRENCE-ID:$now.year.1:0223T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto3/suite8/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,15 +3,15 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060223T110000Z
-DTEND:20060223T120000Z
+DTSTART:$now.year.1:0223T110000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-RECURRENCE-ID:20060223T100000Z
+RECURRENCE-ID:$now.year.1:0223T100000Z
 SEQUENCE:1
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060201T200000Z
-DTEND:20060201T210000Z
+DTSTART:$now.year.1:0201T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060201T200000Z
-DTEND:20060201T210000Z
+DTSTART:$now.year.1:0201T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060201T200000Z
-DTEND:20060201T210000Z
+DTSTART:$now.year.1:0201T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060201T200000Z
-DTEND:20060201T210000Z
+DTSTART:$now.year.1:0201T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:20060203T200000Z
-DTSTART:20060203T210000Z
-DTEND:20060203T220000Z
+RECURRENCE-ID:$now.year.1:0203T200000Z
+DTSTART:$now.year.1:0203T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060201T200000Z
-DTEND:20060201T210000Z
+DTSTART:$now.year.1:0201T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:20060203T200000Z
-DTSTART:20060203T210000Z
-DTEND:20060203T220000Z
+RECURRENCE-ID:$now.year.1:0203T200000Z
+DTSTART:$now.year.1:0203T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060201T200000Z
-DTEND:20060201T210000Z
+DTSTART:$now.year.1:0201T200000Z
+DURATION:PT1H
 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-1
-RECURRENCE-ID:20060203T200000Z
-DTSTART:20060203T210000Z
-DTEND:20060203T220000Z
+RECURRENCE-ID:$now.year.1:0203T200000Z
+DTSTART:$now.year.1:0203T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060201T200000Z
-DTEND:20060201T210000Z
+DTSTART:$now.year.1:0201T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:20060203T200000Z
-DTSTART:20060203T210000Z
-DTEND:20060203T220000Z
+RECURRENCE-ID:$now.year.1:0203T200000Z
+DTSTART:$now.year.1:0203T210000Z
+DURATION:PT1H
 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
-RECURRENCE-ID:20060204T200000Z
-DTSTART:20060203T200000Z
-DTEND:20060203T210000Z
+RECURRENCE-ID:$now.year.1:0204T200000Z
+DTSTART:$now.year.1:0203T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060201T200000Z
-DTEND:20060201T210000Z
+DTSTART:$now.year.1:0201T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:20060203T200000Z
-DTSTART:20060203T210000Z
-DTEND:20060203T220000Z
+RECURRENCE-ID:$now.year.1:0203T200000Z
+DTSTART:$now.year.1:0203T210000Z
+DURATION:PT1H
 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
-RECURRENCE-ID:20060204T200000Z
-DTSTART:20060203T200000Z
-DTEND:20060203T210000Z
+RECURRENCE-ID:$now.year.1:0204T200000Z
+DTSTART:$now.year.1:0203T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060201T200000Z
-DTEND:20060201T210000Z
+DTSTART:$now.year.1:0201T200000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -12,16 +12,16 @@
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE:20060204T200000Z
+EXDATE:$now.year.1:0204T200000Z
 SEQUENCE:2
 SUMMARY:Recurring event
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:event-1
-RECURRENCE-ID:20060203T200000Z
-DTSTART:20060203T210000Z
-DTEND:20060203T220000Z
+RECURRENCE-ID:$now.year.1:0203T200000Z
+DTSTART:$now.year.1:0203T210000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060209T000000Z
-DTEND:20060209T230000Z
+DTSTART:$now.year.1:0209T000000Z
+DURATION:PT23H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060209T000000Z
-DTEND:20060209T230000Z
+DTSTART:$now.year.1:0209T000000Z
+DURATION:PT23H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060209T000000Z
-DTEND:20060209T230000Z
+DTSTART:$now.year.1:0209T000000Z
+DURATION:PT23H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060207T100000Z
-DTEND:20060207T110000Z
+DTSTART:$now.year.1:0207T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060207T100000Z
-DTEND:20060207T110000Z
+DTSTART:$now.year.1:0207T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-RECURRENCE-ID:20060209T100000Z
-DTSTART:20060209T100000Z
-DTEND:20060209T110000Z
+RECURRENCE-ID:$now.year.1:0209T100000Z
+DTSTART:$now.year.1:0209T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite2/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060207T100000Z
-DTEND:20060207T110000Z
+DTSTART:$now.year.1:0207T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-RECURRENCE-ID:20060209T100000Z
-DTSTART:20060209T100000Z
-DTEND:20060209T110000Z
+RECURRENCE-ID:$now.year.1:0209T100000Z
+DTSTART:$now.year.1:0209T100000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060207T120000Z
-DTEND:20060207T130000Z
+DTSTART:$now.year.1:0207T120000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -16,9 +16,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:20060209T120000Z
-DTSTART:20060209T123000Z
-DTEND:20060209T133000Z
+RECURRENCE-ID:$now.year.1:0209T120000Z
+DTSTART:$now.year.1:0209T123000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060207T120000Z
-DTEND:20060207T130000Z
+DTSTART:$now.year.1:0207T120000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -16,9 +16,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:20060209T120000Z
-DTSTART:20060209T123000Z
-DTEND:20060209T133000Z
+RECURRENCE-ID:$now.year.1:0209T120000Z
+DTSTART:$now.year.1:0209T123000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite3/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,9 +3,9 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-RECURRENCE-ID:20060209T120000Z
-DTSTART:20060209T123000Z
-DTEND:20060209T133000Z
+RECURRENCE-ID:$now.year.1:0209T120000Z
+DTSTART:$now.year.1:0209T123000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060207T150000Z
-DTEND:20060207T160000Z
+DTSTART:$now.year.1:0207T150000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -16,9 +16,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:20060209T150000Z
-DTSTART:20060209T153000Z
-DTEND:20060209T163000Z
+RECURRENCE-ID:$now.year.1:0209T150000Z
+DTSTART:$now.year.1:0209T153000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
@@ -30,9 +30,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:20060210T150000Z
-DTSTART:20060210T153000Z
-DTEND:20060210T163000Z
+RECURRENCE-ID:$now.year.1:0210T150000Z
+DTSTART:$now.year.1:0210T153000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060207T150000Z
-DTEND:20060207T160000Z
+DTSTART:$now.year.1:0207T150000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
@@ -16,9 +16,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:20060209T150000Z
-DTSTART:20060209T153000Z
-DTEND:20060209T163000Z
+RECURRENCE-ID:$now.year.1:0209T150000Z
+DTSTART:$now.year.1:0209T153000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -30,9 +30,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:20060210T150000Z
-DTSTART:20060210T153000Z
-DTEND:20060210T163000Z
+RECURRENCE-ID:$now.year.1:0210T150000Z
+DTSTART:$now.year.1:0210T153000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto5/suite4/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,9 +3,9 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:20060209T150000Z
-DTSTART:20060209T153000Z
-DTEND:20060209T163000Z
+RECURRENCE-ID:$now.year.1:0209T150000Z
+DTSTART:$now.year.1:0209T153000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-4
-RECURRENCE-ID:20060210T150000Z
-DTSTART:20060210T153000Z
-DTEND:20060210T163000Z
+RECURRENCE-ID:$now.year.1:0210T150000Z
+DTSTART:$now.year.1:0210T153000Z
+DURATION:PT1H
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060104T000000Z
-DTEND:20060104T010000Z
+DTSTART:$now.year.1:0104T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060104T000000Z
-DTEND:20060104T010000Z
+DTSTART:$now.year.1:0104T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060104T000000Z
-DTEND:20060104T010000Z
+DTSTART:$now.year.1:0104T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0101T000000Z
 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:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
+DTSTART:$now.year.1:0102T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0102T000000Z
 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:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
+DTSTART:$now.year.1:0103T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0103T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite2/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
@@ -17,9 +17,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0101T000000Z
 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:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
+DTSTART:$now.year.1:0102T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0102T000000Z
 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:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
+DTSTART:$now.year.1:0103T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0103T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,10 +3,10 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060104T000000Z
-DTEND:20060104T010000Z
+DTSTART:$now.year.1:0104T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
-EXDATE:20060105T000000Z
+EXDATE:$now.year.1:0105T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,10 +3,10 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060104T000000Z
-DTEND:20060104T010000Z
+DTSTART:$now.year.1:0104T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
-EXDATE:20060105T000000Z
+EXDATE:$now.year.1:0105T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite3/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,10 +3,10 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060104T000000Z
-DTEND:20060104T010000Z
+DTSTART:$now.year.1:0104T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
-EXDATE:20060105T000000Z
+EXDATE:$now.year.1:0105T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0101T000000Z
 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:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
+DTSTART:$now.year.1:0102T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0102T000000Z
 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:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
+DTSTART:$now.year.1:0103T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0103T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0101T000000Z
 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:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
+DTSTART:$now.year.1:0102T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0102T000000Z
 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:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
+DTSTART:$now.year.1:0103T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0103T000000Z
 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:20060105T000000Z
-DTEND:20060105T010000Z
-RECURRENCE-ID:20060105T000000Z
+DTSTART:$now.year.1:0105T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0105T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite4/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0101T000000Z
 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:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
+DTSTART:$now.year.1:0102T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0102T000000Z
 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:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
+DTSTART:$now.year.1:0103T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0103T000000Z
 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:20060105T000000Z
-DTEND:20060105T010000Z
-RECURRENCE-ID:20060105T000000Z
+DTSTART:$now.year.1:0105T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0105T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
@@ -18,9 +18,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0101T000000Z
 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:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
+DTSTART:$now.year.1:0102T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0102T000000Z
 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:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
+DTSTART:$now.year.1:0103T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0103T000000Z
 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:20060105T000000Z
-DTEND:20060105T010000Z
-RECURRENCE-ID:20060105T000000Z
+DTSTART:$now.year.1:0105T000000Z
+DURATION:PT1H
+RECURRENCE-ID:$now.year.1:0105T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
+DTSTART:$now.year.1:0101T000000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208
+DTSTART;VALUE=DATE:$now.year.1:0208
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208
+DTSTART;VALUE=DATE:$now.year.1:0208
 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/trunk/Resource/CalDAV/implicit/auto7/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208
+DTSTART;VALUE=DATE:$now.year.1:0208
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite1/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208
+DTSTART;VALUE=DATE:$now.year.1:0208
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T010000Z
-DTEND:20060208T020000Z
+DTSTART:$now.year.1:0208T010000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T010000Z
-DTEND:20060208T020000Z
+DTSTART:$now.year.1:0208T010000Z
+DURATION:PT1H
 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/trunk/Resource/CalDAV/implicit/auto7/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T010000Z
-DTEND:20060208T020000Z
+DTSTART:$now.year.1:0208T010000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite2/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T010000Z
-DTEND:20060208T020000Z
+DTSTART:$now.year.1:0208T010000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060208T220000Z
-DTEND:20060209T020000Z
+DTSTART:$now.year.1:0208T220000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060208T220000Z
-DTEND:20060209T020000Z
+DTSTART:$now.year.1:0208T220000Z
+DURATION:PT1H
 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/trunk/Resource/CalDAV/implicit/auto7/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060208T220000Z
-DTEND:20060209T020000Z
+DTSTART:$now.year.1:0208T220000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite3/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060208T220000Z
-DTEND:20060209T020000Z
+DTSTART:$now.year.1:0208T220000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060209T120000Z
-DTEND:20060209T130000Z
+DTSTART:$now.year.1:0209T120000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060209T120000Z
-DTEND:20060209T130000Z
+DTSTART:$now.year.1:0209T120000Z
+DURATION:PT1H
 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/trunk/Resource/CalDAV/implicit/auto7/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060209T120000Z
-DTEND:20060209T130000Z
+DTSTART:$now.year.1:0209T120000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite4/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-4
-DTSTART:20060209T120000Z
-DTEND:20060209T130000Z
+DTSTART:$now.year.1:0209T120000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
 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/trunk/Resource/CalDAV/implicit/auto7/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite5/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-5
-DTSTART:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
 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:20060209
-RECURRENCE-ID:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0209
 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/trunk/Resource/CalDAV/implicit/auto7/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
 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:20060209
-RECURRENCE-ID:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0209
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto7/suite6/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-6
-DTSTART:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
 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:20060209
-RECURRENCE-ID:20060209
+DTSTART;VALUE=DATE:$now.year.1:0209
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0209
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-busy/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-free/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-always-recurring/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-busy/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-free/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 RRULE:FREQ=DAILY;COUNT=3
 DURATION:PT1H
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 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:20120102T120000Z
-DTSTART:20120102T120000Z
+RECURRENCE-ID:$now.year.1:0102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/accept-if-free-recurring/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 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:20120102T120000Z
-DTSTART:20120102T120000Z
+RECURRENCE-ID:$now.year.1:0102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-busy/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-free/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 RRULE:FREQ=DAILY;COUNT=3
 DURATION:PT1H
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 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:20120102T120000Z
-DTSTART:20120102T120000Z
+RECURRENCE-ID:$now.year.1:0102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/automatic-recurring/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 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:20120102T120000Z
-DTSTART:20120102T120000Z
+RECURRENCE-ID:$now.year.1:0102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/data/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/data/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/data/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:block at example.com
-DTSTART;VALUE=DATE:20120102
+DTSTART;VALUE=DATE:$now.year.1:0102
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:Block out the day

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-busy/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-free/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-always-recurring/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-busy/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-free/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 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:20120102T120000Z
-DTSTART:20120102T120000Z
+RECURRENCE-ID:$now.year.1:0102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/decline-if-busy-recurring/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 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:20120102T120000Z
-DTSTART:20120102T120000Z
+RECURRENCE-ID:$now.year.1:0102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-busy/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120102T120000Z
+DTSTART:$now.year.1:0102T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ORGANIZER;CN=$username1::$cuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-free/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 DTSTAMP:20120101T120000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automodes/none-recurring/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1 at example.com
-DTSTART:20120101T120000Z
+DTSTART:$now.year.1:0101T120000Z
 DURATION:PT1H
 DTSTAMP:20120101T120000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20091201T080000Z
-DTEND:20091201T090000Z
+DTSTART:$now.year.1:1201T080000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
 ATTENDEE;CN=$resourcename1::$rcuaddralt1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20091201T080000Z
-DTEND:20091201T090000Z
+DTSTART:$now.year.1:1201T080000Z
+DURATION:PT1H
 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/trunk/Resource/CalDAV/implicit/automultiple/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20091201T080000Z
-DTEND:20091201T090000Z
+DTSTART:$now.year.1:1201T080000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/automultiple/suite1/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20091201T080000Z
-DTEND:20091201T090000Z
+DTSTART:$now.year.1:1201T080000Z
+DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/allday_freebusy/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/allday_freebusy/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/allday_freebusy/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -8,8 +8,8 @@
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::urn:uuid:1234-56789
 ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000
+DTSTART:$now.year.1:0101T000000
 DTSTAMP:20060309T185105Z
-DTEND:20060102T000000
+DURATION:P1D
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,38 +35,38 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 STATUS:CANCELLED
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,38 +35,38 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 STATUS:CANCELLED
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,40 +36,40 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 TRANSP:TRANSPARENT
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 TRANSP:TRANSPARENT
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 TRANSP:TRANSPARENT
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,25 +35,25 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,38 +35,38 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 TRANSP:TRANSPARENT
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropcancelled/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,38 +35,38 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 STATUS:CANCELLED
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,37 +35,37 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,37 +35,37 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,40 +36,40 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 TRANSP:TRANSPARENT
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 TRANSP:TRANSPARENT
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 TRANSP:TRANSPARENT
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,25 +35,25 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,38 +35,38 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 TRANSP:TRANSPARENT
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/badclients/dropinstance/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,37 +35,37 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/interleavedreplies/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/singlereply/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/batchrefresh/twoquickreplies/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-delete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-delete/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-delete/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-delete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-delete/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-delete/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 6
 UID:event6 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 6
 UID:event6 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-remove/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event6 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-all/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-all/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-all/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local
@@ -34,11 +34,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
@@ -46,11 +46,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-all/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-all/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-all/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,11 +23,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
@@ -36,11 +36,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 5
 UID:event5 at ninevah.local
@@ -34,11 +34,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 5
 UID:event5 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
@@ -46,11 +46,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 5
 UID:event5 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,23 +23,23 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 5
 UID:event5 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE;TZID=US/Eastern:20060104T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0104T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 5
 UID:event5 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-delete-some/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event5 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event5 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
@@ -34,11 +34,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
@@ -46,11 +46,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
@@ -34,22 +34,22 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-all/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,11 +23,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
@@ -36,11 +36,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 10
 UID:event10 at ninevah.local
@@ -34,11 +34,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 10
 UID:event10 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
@@ -46,11 +46,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 10
 UID:event10 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 10
 UID:event10 at ninevah.local
@@ -34,11 +34,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 10
 UID:event10 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
@@ -46,11 +46,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 10
 UID:event10 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event10 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event10 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/partial-remove-some/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event10 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-all/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-all/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-all/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-all/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-all/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-all/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local
@@ -31,7 +31,7 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE;TZID=US/Eastern:20060103T100000
-EXDATE;TZID=US/Eastern:20060104T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0103T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0104T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-delete-some/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -48,8 +48,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 7
 UID:event7 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 7
 UID:event7 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-all/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event7 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:event8 at ninevah.local
@@ -35,11 +35,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:event8 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
@@ -47,11 +47,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:event8 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:event8 at ninevah.local
@@ -31,16 +31,16 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE;TZID=US/Eastern:20060104T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0104T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:event8 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-some/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event8 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event8 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -46,8 +46,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event8 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090309T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0309T150000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
@@ -35,11 +35,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090330T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0330T150000
 DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20090330T150000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0330T150000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090309T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0309T150000
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
@@ -36,11 +36,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090330T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0330T150000
 DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20090330T150000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0330T150000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090309T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0309T150000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 9
@@ -31,18 +31,18 @@
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-EXDATE;TZID=US/Eastern:20090413T150000
+EXDATE;TZID=US/Eastern:$now.year.1:0413T150000
 RRULE:FREQ=WEEKLY;COUNT=52
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090330T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0330T150000
 DURATION:PT2H
 SEQUENCE:1
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20090330T150000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0330T150000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090309T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0309T150000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 9
@@ -37,12 +37,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090330T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0330T150000
 DURATION:PT2H
 SEQUENCE:1
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20090330T150000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0330T150000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -51,12 +51,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090413T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0413T150000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20090413T150000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0413T150000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090309T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0309T150000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 9
@@ -31,19 +31,19 @@
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-EXDATE;TZID=US/Eastern:20090413T150000
-EXDATE;TZID=US/Eastern:20090406T150000
+EXDATE;TZID=US/Eastern:$now.year.1:0413T150000
+EXDATE;TZID=US/Eastern:$now.year.1:0406T150000
 RRULE:FREQ=WEEKLY;COUNT=52
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090330T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0330T150000
 DURATION:PT2H
 SEQUENCE:2
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20090330T150000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0330T150000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090309T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0309T150000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 9
@@ -37,12 +37,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090330T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0330T150000
 DURATION:PT2H
 SEQUENCE:2
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20090330T150000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0330T150000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -51,12 +51,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090413T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0413T150000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20090413T150000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0413T150000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -66,12 +66,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20090406T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0406T150000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 9
 UID:event9 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20090406T150000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0406T150000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:event8 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:event8 at ninevah.local
@@ -31,6 +31,6 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE;TZID=US/Eastern:20060104T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0104T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event8 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event8 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/still-cancelled/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event8 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event8 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
@@ -46,8 +46,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event8 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -34,9 +34,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
@@ -33,9 +33,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/oneinstance-rewrite/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
@@ -33,9 +33,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,11 +35,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060101T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0101T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/organizer-merge/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060101T100000
-DTSTART;TZID=US/Eastern:20060101T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -34,9 +34,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
@@ -46,9 +46,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
@@ -33,9 +33,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -45,9 +45,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -35,9 +35,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
@@ -33,9 +33,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T151000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -34,9 +34,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/compatibility/twoinstance-rewrite/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
@@ -33,9 +33,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -45,9 +45,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/copymove/put-restrictions/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event5 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event5 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/deletecalendar/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event5 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/toggle/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 4
@@ -32,7 +32,7 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE:20060102T150000Z
-EXDATE:20060103T150000Z
+EXDATE:$now.year.1:0102T150000Z
+EXDATE:$now.year.1:0103T150000Z
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 4
@@ -32,7 +32,7 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE:20060103T150000Z
-EXDATE:20060102T150000Z
+EXDATE:$now.year.1:0103T150000Z
+EXDATE:$now.year.1:0102T150000Z
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 4
@@ -32,8 +32,8 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE:20060102T150000Z
-EXDATE:20060103T150000Z
-EXDATE:20060105T150000Z
+EXDATE:$now.year.1:0102T150000Z
+EXDATE:$now.year.1:0103T150000Z
+EXDATE:$now.year.1:0105T150000Z
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/bad-attendee-put/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/bad-attendee-put/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/bad-attendee-put/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event123 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/bad-content-type/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/bad-content-type/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/bad-content-type/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/organizer-orphaned-instance/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/organizer-orphaned-instance/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/organizer-orphaned-instance/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,8 +23,8 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-RECURRENCE-ID;TZID=US/Eastern:20060101T100000
-DTSTART;TZID=US/Eastern:20060101T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20120101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:recurrence1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:recurrence1 at ninevah.local
-DTSTART;TZID=US/Eastern:20120101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:recurrence1 at ninevah.local
-DTSTART;TZID=US/Eastern:20120101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20120101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:recurrence1 at ninevah.local
@@ -31,6 +31,6 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=20
-EXDATE;TZID=US/Eastern:20120115T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0115T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,13 +22,13 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:recurrence1 at ninevah.local
-DTSTART;TZID=US/Eastern:20120101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE;TZID=US/Eastern:20120115T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0115T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=20
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/errors/recurrence-expand/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,13 +22,13 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:recurrence1 at ninevah.local
-DTSTART;TZID=US/Eastern:20120101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE;TZID=US/Eastern:20120115T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0115T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=20
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event external 2
 UID:event-external-2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event external 2
 UID:event-external-2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event external 2
 UID:event-external-2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event external 2
 UID:event-external-2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event external
 UID:event-external-3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/15.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/15.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event external
 UID:event-external-4 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event external
 UID:event-external at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event external
 UID:event-external at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/large/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/large/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/large/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/large/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/large/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/large/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/large/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/large/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/large/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1
@@ -32,6 +32,6 @@
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=100
-EXDATE:20060102T170000Z
+EXDATE:$now.year.1:0102T170000Z
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,13 +22,13 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2:;SCHEDULE-STATUS=1.2:$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE:20060102T170000Z
+EXDATE:$now.year.1:0102T170000Z
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=100
 SEQUENCE:2

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
-DTSTART;TZID=US/Eastern:20060102T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
@@ -36,9 +36,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
 SEQUENCE:1
 SUMMARY:event 1-2
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -36,8 +36,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/simple/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/privateevents/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS=2.0:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-2
-DTSTART:20060208T120000Z
-DTEND:20060208T130000Z
+DTSTART:$now.year.1:0208T120000Z
+DURATION:PT1H
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-3
-DTSTART:20060208T100000Z
-DTEND:20060208T110000Z
+DTSTART:$now.year.1:0208T100000Z
+DURATION:PT1H
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
 ATTENDEE;CN=$username3:;RSVP=TRUE:$cuaddralt3:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
 ATTENDEE;CN=$username3:;PARTSTAT=DECLINED:$cuaddralt3:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
 ATTENDEE;CN=$username3:;RSVP=TRUE:$cuaddralt3:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
 ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED:$cuaddralt3:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;
  EMAIL=$email3::$cuaddrurn3:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/proxy/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,8 +3,8 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
+DTSTART:$now.year.1:0208T200000Z
+DURATION:PT1H
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
 SUMMARY:event 1
@@ -35,9 +35,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 DURATION:PT1H
-RECURRENCE-ID;VALUE=DATE:20060102
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0102
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
 SUMMARY:event 1
@@ -35,9 +35,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 DURATION:PT1H
-RECURRENCE-ID;VALUE=DATE:20060102
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0102
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
@@ -35,9 +35,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 DURATION:PT1H
-RECURRENCE-ID;VALUE=DATE:20060102
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0102
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
 SEQUENCE:1
@@ -36,9 +36,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 DURATION:PT1H
-RECURRENCE-ID;VALUE=DATE:20060102
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0102
 SEQUENCE:1
 SUMMARY:event 1-2 changed
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
 SEQUENCE:1
@@ -36,9 +36,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 DURATION:PT1H
-RECURRENCE-ID;VALUE=DATE:20060102
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0102
 SEQUENCE:1
 SUMMARY:event 1-2 changed
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
@@ -36,9 +36,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 DURATION:PT1H
-RECURRENCE-ID;VALUE=DATE:20060102
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0102
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
@@ -31,6 +31,6 @@
 ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 3
 RRULE:FREQ=DAILY;COUNT=5
-EXDATE:20060103T150000Z
+EXDATE:$now.year.1:0103T150000Z
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/attendeedelete/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
@@ -34,9 +34,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,9 +23,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
@@ -35,8 +35,8 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,10 +22,10 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
-EXDATE:20060102T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
+EXDATE:$now.year.1:0102T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,10 +22,10 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
-EXDATE:20060102T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
+EXDATE:$now.year.1:0102T150000Z
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T151000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -34,9 +34,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0104T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -35,9 +35,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0104T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -35,9 +35,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/dtstart_change/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,10 +22,10 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
-EXDATE:20060102T170000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0104T150000Z
+EXDATE:$now.year.1:0102T170000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,11 +35,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,11 +35,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,11 +23,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,11 +36,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,11 +23,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -38,11 +38,11 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1
@@ -36,12 +36,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1
@@ -37,12 +37,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1
@@ -37,12 +37,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:3
 SUMMARY:event 1 - master
@@ -36,12 +36,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 SEQUENCE:3
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:3
 SUMMARY:event 1 - master
@@ -36,12 +36,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 SEQUENCE:3
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/15.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/15.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:3
 SUMMARY:event 1 - master
@@ -37,12 +37,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 SEQUENCE:3
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/16.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/16.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:3
 SUMMARY:event 1 - master
@@ -37,12 +37,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 SEQUENCE:3
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
@@ -36,12 +36,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
@@ -36,12 +36,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
@@ -37,12 +37,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
@@ -37,12 +37,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1
@@ -36,12 +36,12 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY;COUNT=52;WKST=SU;INTERVAL=1;BYDAY=MO,WE,FR
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/rrule/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,9 +23,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T151000Z
@@ -34,9 +34,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=DECLINED:$cuaddr2:
 CREATED:20060101T151000Z
@@ -47,9 +47,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060105T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0105T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060105T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0105T100000
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=DECLINED:$cuaddr2:
 CREATED:20060101T151000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0201T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -34,9 +34,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -46,9 +46,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060105T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0105T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060105T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0105T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0104T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -35,9 +35,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0104T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -35,9 +35,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/truncation/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.1:0104T150000Z
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
@@ -35,9 +35,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite1/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/truncate/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
-DTSTART;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,8 +35,8 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T110000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T110000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T110000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T110000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T110000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T110000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T110000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T110000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
@@ -34,8 +34,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T110000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T110000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T110000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T110000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/simple/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T110000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=2.0:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=2.0:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 LAST-MODIFIED:20051222T215953Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/alarms/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/attendeedelete/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/duplicate-attendee/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 SUMMARY:event 2
@@ -32,9 +32,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 2.1
 UID:event2 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 CREATED:20060101T150000Z
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=3
 CREATED:20060101T150000Z
@@ -32,9 +32,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,9 +22,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-x-properties/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/organizerdelete/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 4-1
 UID:event4-1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 4-1
 UID:event4-1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 UID:event4-1 at ninevah.local
 RRULE:FREQ=DAILY;COUNT=3
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4-1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4-1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4-1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
@@ -34,7 +34,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event4-1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
@@ -42,7 +42,7 @@
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 4-1
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 BEGIN:VALARM
 ACTION:DISPLAY
 DESCRIPTION:Alarm for Attendee!

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 4-1 changed

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4-1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -36,7 +36,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event4-1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
@@ -46,7 +46,7 @@
 SEQUENCE:1
 SUMMARY:event 4-1 changed
 TRANSP:TRANSPARENT
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 BEGIN:VALARM
 ACTION:DISPLAY
 DESCRIPTION:Alarm for Attendee!

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=America/New_York:20060101T100000
+DTSTART;TZID=America/New_York:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/tzid-reset/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,8 +23,8 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060401T150000
-DTEND;TZID=US/Eastern:20060401T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0401T150000
+DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060401T150000
-DTEND;TZID=US/Eastern:20060401T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0401T150000
+DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060401T150000
-DTEND;TZID=US/Eastern:20060401T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0401T150000
+DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060401T150000
-DTEND;TZID=US/Eastern:20060401T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0401T150000
+DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060401T150000
-DTEND;TZID=US/Eastern:20060401T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0401T150000
+DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060401T150000
-DTEND;TZID=US/Eastern:20060401T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0401T150000
+DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
@@ -34,9 +34,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060402T150000
-DTEND;TZID=US/Eastern:20060402T160000
-RECURRENCE-ID;TZID=US/Eastern:20060402T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0402T150000
+DURATION:PT1H
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0402T150000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/dstshift/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,8 +22,8 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060401T150000
-DTEND;TZID=US/Eastern:20060401T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0401T150000
+DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
@@ -34,9 +34,9 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060402T150000
-DTEND;TZID=US/Eastern:20060402T160000
-RECURRENCE-ID;TZID=US/Eastern:20060402T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0402T150000
+DURATION:PT1H
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0402T150000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario2/simple/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,13 +22,13 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE;TZID=US/Eastern:20060103T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=3
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,13 +22,13 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE;TZID=US/Eastern:20060103T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=3
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-DTSTART;TZID=US/Eastern:20060103T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel1/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,13 +22,13 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE;TZID=US/Eastern:20060103T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=3
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,14 +22,14 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE;TZID=US/Eastern:20060103T100000
-EXDATE;TZID=US/Eastern:20060102T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0103T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=3
 SEQUENCE:2

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,14 +22,14 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE;TZID=US/Eastern:20060103T100000
-EXDATE;TZID=US/Eastern:20060102T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0103T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=3
 SEQUENCE:2

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,13 +22,13 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE;TZID=US/Eastern:20060103T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0103T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=3
 SEQUENCE:2
@@ -36,8 +36,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/cancel2/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,14 +22,14 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-EXDATE;TZID=US/Eastern:20060103T100000
-EXDATE;TZID=US/Eastern:20060102T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0103T100000
+EXDATE;TZID=US/Eastern:$now.year.1:0102T100000
 ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=3
 SEQUENCE:2

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario3/setup/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:3
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:2
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 RRULE:FREQ=DAILY;COUNT=2
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/attendeeinstance/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 RRULE:FREQ=DAILY;COUNT=2
 SUMMARY:event 1
@@ -35,9 +35,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DTEND;TZID=US/Eastern:20060102T110000
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
@@ -35,9 +35,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
-RECURRENCE-ID;TZID=US/Eastern:20060101T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0101T100000
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
@@ -47,9 +47,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DTEND;TZID=US/Eastern:20060104T110000
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
@@ -35,9 +35,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
-RECURRENCE-ID;TZID=US/Eastern:20060101T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0101T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
@@ -47,9 +47,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DTEND;TZID=US/Eastern:20060104T110000
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/masteronly/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
@@ -35,9 +35,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
-RECURRENCE-ID;TZID=US/Eastern:20060101T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0101T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
@@ -47,9 +47,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DTEND;TZID=US/Eastern:20060104T110000
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
@@ -35,9 +35,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DTEND;TZID=US/Eastern:20060102T110000
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
@@ -47,9 +47,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DTEND;TZID=US/Eastern:20060104T110000
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1
@@ -35,9 +35,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DTEND;TZID=US/Eastern:20060102T110000
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
@@ -47,9 +47,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DTEND;TZID=US/Eastern:20060104T110000
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/multiinstance/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 RRULE:FREQ=DAILY;COUNT=4
 SUMMARY:event 1-changed
@@ -35,9 +35,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DTEND;TZID=US/Eastern:20060102T110000
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
@@ -47,9 +47,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T120000
 DTEND;TZID=US/Eastern:20060104T130000
-RECURRENCE-ID;TZID=US/Eastern:20060104T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=America/New_York:20060101T110000
+DTSTART;TZID=America/New_York:$now.year.1:0101T110000
 DTEND;TZID=America/New_York:20060101T120000
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 DTEND;VALUE=DATE:20060102
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DTEND;TZID=US/Eastern:20060101T110000
 SUMMARY:event 1 - changed
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/15.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/15.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/16.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/16.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T151000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/17.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/17.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T151000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/18.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/18.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/19.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/19.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/20.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/20.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T151000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;SCHEDULE-STATUS=1.2;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/21.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/21.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
 ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=NEEDS-ACTION;RSVP=TR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/22.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/22.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
 ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=NEEDS-ACTION;RSVP=TR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1: Bogus;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2: Bogus;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;SCHEDULE-FORCE-SEND=REQUEST;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/organizerreinvite/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeepartycrash/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchbogusorganizer/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event4 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/attendeeswitchorganizer/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SUMMARY:spoofed event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerforgery/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=5.3;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=5.3;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 5
 UID:event5 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event5 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event5 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/security/organizerswitchbogusorganizer/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event5 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/sequence/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,37 +35,37 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,37 +35,37 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -36,40 +36,40 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 TRANSP:TRANSPARENT
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 TRANSP:TRANSPARENT
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 TRANSP:TRANSPARENT
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,37 +35,37 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -35,37 +35,37 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SUMMARY:event 1-1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091214T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1214T100000
 DURATION:PT1H
 SUMMARY:event 1-3
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091214T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1214T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
@@ -36,7 +36,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1-1
@@ -44,12 +44,12 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1-2
@@ -57,6 +57,6 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
@@ -36,7 +36,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1-1
@@ -44,12 +44,12 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1-2
@@ -57,6 +57,6 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/timezones/simple/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091019T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1019T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1
@@ -36,7 +36,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091026T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1026T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1-1
@@ -44,12 +44,12 @@
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091026T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1026T100000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20091102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:1102T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event 1-2
@@ -57,6 +57,6 @@
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RECURRENCE-ID;TZID=US/Eastern:20091102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:1102T100000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VTODO
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/attendeedelete/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VTODO
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-1 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VTODO
 UID:put-2 at example.com
-DUE:20110427
+DUE;VALUE=DATE:20110427
 DTSTAMP:20051222T205953Z
 SUMMARY:todo 1
 END:VTODO

Modified: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-5 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 5

Modified: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VTODO
 UID:put-6 at example.com
-DUE:20110427
+DUE;VALUE=DATE:20110427
 DTSTAMP:20051222T205953Z
 SUMMARY:todo 6
 END:VTODO

Modified: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-8 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 8

Modified: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VTODO
 UID:put-9 at example.com
-DUE:20110427
+DUE;VALUE=DATE:20110427
 DTSTAMP:20051222T205953Z
 SUMMARY:todo 9
 END:VTODO

Modified: CalDAVTester/trunk/Resource/CalDAV/monitor/get/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/monitor/get/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/monitor/get/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/nonascii/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/nonascii/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/nonascii/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/nonascii/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/nonascii/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/nonascii/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:\xD4test\xD5
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/nonascii/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/nonascii/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/nonascii/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:\xD4test\xD5
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/nonascii/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/nonascii/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/nonascii/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:tést
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/nonascii/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/nonascii/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/nonascii/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:test
 UID:cntest at example.com

Modified: CalDAVTester/trunk/Resource/CalDAV/nonascii/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/nonascii/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/nonascii/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:test
 UID:cntest at example.com

Modified: CalDAVTester/trunk/Resource/CalDAV/nonascii/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/nonascii/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/nonascii/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:tést
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/calendaruserproxy/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
+DTSTART:$now.year.1:0208T200000Z
 DTEND:20060208T210000Z
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED:$othercuaddralt1:
 ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
+DTSTART:$now.year.1:0208T200000Z
 DTEND:20060208T210000Z
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;EMAIL=$otheremail1::$othercuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
+DTSTART:$now.year.1:0208T200000Z
 DTEND:20060208T210000Z
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;EMAIL=$otheremail1::$othercuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleauto/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:event-1
-DTSTART:20060208T200000Z
+DTSTART:$now.year.1:0208T200000Z
 DTEND:20060208T210000Z
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;EMAIL=$otheremail1::$othercuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;EMAIL=$otheremail1::$othercuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$otherusername1:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$otheremail1::$othercuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$otherusername1:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$otheremail1::$othercuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED:$othercuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$otheremail1::$othercuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;EMAIL=$otheremail1::$othercuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED:$othercuaddr1:

Modified: CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/partitioning/scheduleimplicit/suite1/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$otheremail1::$othercuaddrurn1:

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:F5B811E00073B22BA6B87562-%ctr at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T180000
 DURATION:PT1H
 CREATED:20060102T230000Z
 DTSTAMP:20051222T210507Z
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:F5B811E00073B22BA6B87562-%ctr at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern;RANGE=THISANDFUTURE:20060104T180000
-DTSTART;TZID=US/Eastern:20060104T200000
+RECURRENCE-ID;TZID=US/Eastern;RANGE=THISANDFUTURE:$now.year.1:0104T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T200000
 DURATION:PT1H
 CREATED:20060102T230000Z
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-10-%ctr at ninevah.local
-DTSTART;TZID=US/Eastern:20060108T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T100000
 DURATION:PT1H
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:9A6519F71822CD45840C3440-%ctr at ninevah.local
-DTSTART;TZID=US/Mountain:20060101T110000
+DTSTART;TZID=US/Mountain:$now.year.1:0101T110000
 DURATION:PT1H
 CREATED:20060101T160000Z
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:F5B811E00073B22BA6B87551-%ctr at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T140000
 DURATION:PT1H
 CREATED:20060102T190000Z
 DTSTAMP:20051222T210507Z
@@ -31,8 +31,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:F5B811E00073B22BA6B87551-%ctr at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T140000
-DTSTART;TZID=US/Eastern:20060104T160000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T160000
 DURATION:PT1H
 CREATED:20060102T190000Z
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-%ctr at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:DB3F97EF10A051730E2F752E-%ctr at ninevah.local
-DTSTART;TZID=US/Pacific:20060101T130000
+DTSTART;TZID=US/Pacific:$now.year.1:0101T130000
 DURATION:PT1H
 CREATED:20060101T210000Z
 DTSTAMP:20051222T210146Z

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-8-%ctr at ninevah.local
-DTSTART;TZID=US/Eastern:20060107T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0107T100000
 DURATION:PT1H
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-9-%ctr at ninevah.local
-DTSTART;TZID=US/Eastern:20060107T103000
+DTSTART;TZID=US/Eastern:$now.year.1:0107T103000
 DURATION:PT1H
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:A3217B429B4D2FF2DC2EEE66-%ctr at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 CREATED:20060101T230000Z
 DTSTAMP:20051222T210310Z

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/client-sim/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:945113826375CBB89184DC36-%ctr at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 CREATED:20060102T150000Z
 DTSTAMP:20051222T210412Z

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/put/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/put/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/put/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/put/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/put/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/put/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
 SEQUENCE:1
@@ -49,10 +49,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -78,10 +78,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060103T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -107,10 +107,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060104T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -136,10 +136,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060105T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0105T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -165,10 +165,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060106T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0106T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -194,10 +194,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060107T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0107T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -223,10 +223,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060108T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0108T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -252,10 +252,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060109T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0109T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -281,10 +281,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060110T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0110T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -310,10 +310,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060111T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0111T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -339,10 +339,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060112T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0112T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -368,10 +368,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060113T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0113T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -397,10 +397,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060114T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0114T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -426,10 +426,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060115T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0115T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -455,10 +455,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060116T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0116T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -484,10 +484,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060117T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0117T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -513,10 +513,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060118T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0118T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -542,10 +542,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060119T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0119T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -571,10 +571,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060120T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0120T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -600,10 +600,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060121T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0121T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -629,10 +629,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060122T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0122T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -658,10 +658,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060123T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0123T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -687,10 +687,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060124T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0124T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -716,10 +716,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060125T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0125T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -745,10 +745,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060126T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0126T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -774,10 +774,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060127T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0127T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -803,10 +803,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060128T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0128T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -832,10 +832,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060129T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0129T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -861,10 +861,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060130T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0130T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -890,10 +890,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060131T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0131T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com
@@ -919,10 +919,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060201T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0201T120000
 SEQUENCE:1
 SUMMARY:event 3
 ATTENDEE:user01 at example.com

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/put/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/put/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/put/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 6 and some more text and some more text
   and some more text and some more text and some more text

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/put/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/put/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/put/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:4365E6E4867B9E3C8EA4142B at example.local
-DTSTART;TZID=US/Eastern:20060102T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/put/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/put/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/put/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/schedule/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/schedule/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/schedule/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/schedule/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/schedule/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/schedule/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
 SEQUENCE:1
@@ -51,10 +51,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060102T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -81,10 +81,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060103T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -111,10 +111,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060104T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -141,10 +141,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060105T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0105T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -171,10 +171,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060106T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0106T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -201,10 +201,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060107T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0107T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -231,10 +231,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060108T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0108T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -261,10 +261,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060109T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0109T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -291,10 +291,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060110T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0110T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -321,10 +321,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060111T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0111T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -351,10 +351,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060112T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0112T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -381,10 +381,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060113T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0113T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -411,10 +411,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060114T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0114T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -441,10 +441,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060115T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0115T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -471,10 +471,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060116T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0116T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -501,10 +501,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060117T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0117T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -531,10 +531,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060118T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0118T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -561,10 +561,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060119T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0119T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -591,10 +591,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060120T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0120T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -621,10 +621,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060121T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0121T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -651,10 +651,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060122T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0122T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -681,10 +681,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060123T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0123T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -711,10 +711,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060124T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0124T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -741,10 +741,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060125T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0125T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -771,10 +771,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060126T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0126T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -801,10 +801,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060127T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0127T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -831,10 +831,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060128T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0128T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -861,10 +861,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060129T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0129T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -891,10 +891,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060130T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0130T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -921,10 +921,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060131T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0131T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com
@@ -951,10 +951,10 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
-RECURRENCE-ID;TZID=US/Eastern:20060201T120000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0201T120000
 SEQUENCE:1
 SUMMARY:event 3
 DESCRIPTION: ATTENDEE:user01 at example.com

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/schedule/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/schedule/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/schedule/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 6 and some more text and some more text
   and some more text and some more text and some more text

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/schedule/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/schedule/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/schedule/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
-DTSTART:20060201T000000Z
+DTSTART:$now.year.1:0201T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060202T000000Z
 END:VFREEBUSY

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/schedule/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/schedule/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/schedule/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -16,7 +16,7 @@
 ATTENDEE;CN=User 09:/principals/user/user09
 ATTENDEE;CN=User 10:/principals/user/user10
 ATTENDEE;CN=User 11:/principals/user/user11
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060102T000000Z
 END:VFREEBUSY

Modified: CalDAVTester/trunk/Resource/CalDAV/performance/schedule/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/performance/schedule/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/performance/schedule/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -104,7 +104,7 @@
 ATTENDEE;CN=User 97:/principals/user/user97
 ATTENDEE;CN=User 98:/principals/user/user98
 ATTENDEE;CN=User 99:/principals/user/user99
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060102T000000Z
 END:VFREEBUSY

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060108T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T120000
 DURATION:PT1H
 SUMMARY:event 8
 UID:8 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060108T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T120000
 DURATION:PT1H
 SUMMARY:event 8
 UID:8 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060112T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0112T100000
 DURATION:PT1H
 SUMMARY:event 12
 UID:12 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060113T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0113T100000
 DURATION:PT1H
 SUMMARY:event 13
 UID:13 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060114T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0114T100000
 DURATION:PT1H
 SUMMARY:event 14
 UID:14 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 SUMMARY:event 2
 UID:2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
 DURATION:PT1H
 SUMMARY:event 4
 UID:4 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060105T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0105T100000
 DURATION:PT1H
 SUMMARY:event 4.1
 UID:4 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060106T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0106T100000
 DURATION:PT1H
 SUMMARY:event 6
 UID:6 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060107T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0107T100000
 DURATION:PT1H
 SUMMARY:event 7
 UID:7 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060108T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:8 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/prefer/return/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/prefer/return/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/prefer/return/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060108T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:8 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/15.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/15.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/16.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/16.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/17.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/17.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/18.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/18.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/19.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/19.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/20.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/20.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/21.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/21.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/22.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/22.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
@@ -36,8 +36,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/23.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/23.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/24.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/24.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/24.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/25.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/25.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/25.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/26.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/26.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/26.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/27.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/27.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/27.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/28.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/28.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/28.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/29.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/29.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/29.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/30.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/30.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/30.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/31.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/31.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/31.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/33.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/33.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/33.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/34.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/34.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/34.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/36.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/36.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/36.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/38.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/38.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event3 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/40.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/40.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/40.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
@@ -35,8 +35,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/41.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/41.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/41.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
@@ -36,8 +36,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:event2 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-DTSTART;TZID=US/Eastern:20060102T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event confidential access 1
 LOCATION:confidential 1

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event confidential access 2
 LOCATION:confidential 2

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event restricted access 1
 LOCATION:restricted 1

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event restricted access 2
 LOCATION:restricted 2

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -25,7 +25,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 3
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/38.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/38.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,14 +21,14 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842FFF at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event default access
 END:VEVENT
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842FFA at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event public access
@@ -40,7 +40,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842FFB at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event private access
@@ -52,7 +52,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842FFC at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 DTSTAMP:20051222T205953Z
@@ -67,7 +67,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842FFD at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/39.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/39.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/39.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,14 +21,14 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842FFF at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event default access
 END:VEVENT
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842FFA at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event public access
@@ -40,13 +40,13 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842FFC at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 END:VEVENT
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842FFD at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 LOCATION:restricted 1

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/40.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/40.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/40.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event confidential access 1
 LOCATION:confidential 1

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/41.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/41.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/41.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event confidential access 2

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/42.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/42.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/42.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event restricted access 1
 LOCATION:restricted 1

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/43.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/43.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/43.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event restricted access 2

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/44.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/44.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/44.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event default access
 UID:54E181BC7CCC373042B28842FFF-44 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/45.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/45.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/45.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event public access
 UID:54E181BC7CCC373042B28842FFA-45 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/46.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/46.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/46.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event private access
 UID:54E181BC7CCC373042B28842FFB-46 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/47.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/47.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/47.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event confidential access 2
 LOCATION:confidential 2

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/48.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/48.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/48.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event restricted access 2
 LOCATION:restricted 2

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/49.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/49.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/49.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event confidential access 2

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event default access
 UID:54E181BC7CCC373042B28842FFF at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/50.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/50.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/50.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SEQUENCE:1
 SUMMARY:event restricted access 2

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event public access
 UID:54E181BC7CCC373042B28842FFA at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event public access
 UID:54E181BC7CCC373042B28842FFA at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event private access
 UID:54E181BC7CCC373042B28842FFB at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event private access
 UID:54E181BC7CCC373042B28842FFB at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,12 +20,12 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:New Event
-EXDATE;TZID=America/Vancouver:20060712T133000
-EXDATE;TZID=America/Vancouver:20060710T133000
-EXDATE;TZID=America/Vancouver:20060714T133000
+EXDATE;TZID=America/Vancouver:$now.year.1:0712T133000
+EXDATE;TZID=America/Vancouver:$now.year.1:0710T133000
+EXDATE;TZID=America/Vancouver:$now.year.1:0714T133000
 SEQUENCE:5
-DTEND;TZID=America/Vancouver:20060709T143000
-DTSTART;TZID=America/Vancouver:20060709T133000
+DTEND;TZID=America/Vancouver:$now.year.1:0709T143000
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T133000
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=500
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART:20060709T120000Z
+DTSTART:$now.year.1:0709T120000Z
 DUE;TZID=America/Vancouver:20060709T120000Z
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART:20060709T120000Z
+DTSTART:$now.year.1:0709T120000Z
 DUE:20060709T200000
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART;TZID=America/Vancouver:20060709T120000
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T120000
 DUE:20060709T200000Z
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART;TZID=America/Vancouver:20060709T120000
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T120000
 DUE:20060709T200000
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART:20060709T120000
+DTSTART:$now.year.1:0709T120000
 DUE;TZID=America/Vancouver:20060709T200000
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/15.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/15.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART:20060709T120000
+DTSTART:$now.year.1:0709T120000
 DUE:20060709T200000Z
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/16.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/16.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:New Event
-DTSTART;TZID=America/Vancouver:20060709T120000
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T120000
 DTEND;VALUE=DATE:20060711
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-16

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/17.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/17.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 SUMMARY:New Event
-DTSTART:20060709T120000
+DTSTART:$now.year.1:0709T120000
 DTEND;VALUE=DATE:20060711
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-17

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/18.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/18.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART;TZID=America/Vancouver:20060709T120000
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T120000
 DUE;VALUE=DATE:20060711
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/19.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/19.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART:20060709T120000
+DTSTART:$now.year.1:0709T120000
 DUE;VALUE=DATE:20060711
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 SUMMARY:New Event
-DTSTART:20060709T120000Z
+DTSTART:$now.year.1:0709T120000Z
 DTEND;VALUE=DATE:20060711
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/20.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/20.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART;VALUE=DATE:20060709
+DTSTART;VALUE=DATE:$now.year.1:0709
 DUE:20060711T120000Z
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/21.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/21.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART;VALUE=DATE:20060709
+DTSTART;VALUE=DATE:$now.year.1:0709
 DUE;TZID=America/Vancouver:20060711T120000
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/22.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/22.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART;VALUE=DATE:20060709
+DTSTART;VALUE=DATE:$now.year.1:0709
 DUE:20060711T120000
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/23.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/23.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,15 +22,15 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-DTSTART;TZID=US/Eastern:20060101T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 2
 UID:54E181BC7CCC373042B28842-23 at ninevah.local
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=10
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:New Event
-DTSTART:20060709T120000Z
+DTSTART:$now.year.1:0709T120000Z
 DTEND;TZID=America/Vancouver:20060709T120000
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-3

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 SUMMARY:New Event
-DTSTART:20060709T120000Z
+DTSTART:$now.year.1:0709T120000Z
 DTEND:20060709T120000
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-4

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:New Event
-DTSTART;TZID=America/Vancouver:20060709T120000
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T120000
 DTEND:20060709T230000Z
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-5

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:New Event
-DTSTART;TZID=America/Vancouver:20060709T120000
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T120000
 DTEND:20060709T230000
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-6

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 SUMMARY:New Event
-DTSTART:20060709T120000
+DTSTART:$now.year.1:0709T120000
 DTEND:20060709T200000Z
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-7

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:New Event
-DTSTART:20060709T120000
+DTSTART:$now.year.1:0709T120000
 DTEND;TZID=America/Vancouver:20060709T200000
 DTSTAMP:20060710T225223Z
 UID:95C0F1E7-F691-42DD-8889-4E0B700B9778-8

Modified: CalDAVTester/trunk/Resource/CalDAV/problemics/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/problemics/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/problemics/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -20,7 +20,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T145254Z
-DTSTART;TZID=America/Vancouver:20060709T120000
+DTSTART;TZID=America/Vancouver:$now.year.1:0709T120000
 DUE;VALUE=DATE:20060711
 STATUS:NEEDS-ACTION
 SUMMARY:Task #2

Modified: CalDAVTester/trunk/Resource/CalDAV/put/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/put/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-1 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/put/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/put/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-1 at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1D
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/put/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/put/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:put-3X- at example.com
-DTSTART:20110427
+DTSTART;VALUE=DATE:$now.year.1:0427
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/quota/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/quota/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/quota/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=100
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,9 +23,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20070101T170000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.2:0101T170000Z
 SUMMARY:event 1
 UID:event11r at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=600
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 UID:event11r at example.local
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=400
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/15.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/15.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,9 +23,9 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
-RRULE:FREQ=DAILY;UNTIL=20090101T170000Z
+RRULE:FREQ=DAILY;UNTIL=$now.year.4:0101T170000Z
 SUMMARY:event 1
 UID:event11r at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/16.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/16.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 UID:event11r at example.local
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=400
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/17.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/17.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 UID:event11r at example.local
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=YEARLY
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/18.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/18.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/19.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/19.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 UID:event11r at example.local
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=400
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,7 +5,7 @@
 X-WR-CALNAME:CalDAV tests
 BEGIN:VEVENT
 DTSTAMP:20060202T205550Z
-DTSTART;VALUE=DATE:20060101
+DTSTART;VALUE=DATE:$now.year.1:0101
 SUMMARY:event 2
 UID:event2 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/20.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/20.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -25,7 +25,7 @@
 
 
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/21.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/21.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205644Z
-DTSTART;TZID=US/Eastern:20060102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 3

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,7 +5,7 @@
 X-WR-CALNAME:CalDAV tests
 BEGIN:VEVENT
 DTSTAMP:20060202T205720Z
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 4
 UID:event4 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205741Z
-DTSTART;TZID=US/Eastern:20060102T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T140000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 5
@@ -31,9 +31,9 @@
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20060202T205741Z
-DTSTART;TZID=US/Eastern:20060104T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T150000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060104T140000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T140000
 SUMMARY:event 5 bis
 UID:event5 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/6.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/6.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/6.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,15 +5,15 @@
 X-WR-CALNAME:CalDAV tests
 BEGIN:VEVENT
 DTSTAMP:20060202T205756Z
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 6
 UID:event6 at example.local
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20060202T205756Z
-DTSTART;VALUE=DATE:20060107
-RECURRENCE-ID;VALUE=DATE:20060104
+DTSTART;VALUE=DATE:$now.year.1:0107
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0104
 SUMMARY:event 6 bis
 UID:event6 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/7.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/7.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/7.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205820Z
-DTSTART;TZID=US/Eastern:20060102T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T160000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 7
@@ -31,9 +31,9 @@
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20060202T205820Z
-DTSTART;TZID=US/Eastern:20060104T170000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T170000
 DURATION:PT1H
-RECURRENCE-ID;RANGE=THISANDFUTURE;TZID=US/Eastern:20060104T160000
+RECURRENCE-ID;RANGE=THISANDFUTURE;TZID=US/Eastern:$now.year.1:0104T160000
 SUMMARY:event 7 bis
 UID:event7 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/8.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/8.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/8.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,15 +5,15 @@
 X-WR-CALNAME:CalDAV tests
 BEGIN:VEVENT
 DTSTAMP:20060202T205834Z
-DTSTART;VALUE=DATE:20060102
+DTSTART;VALUE=DATE:$now.year.1:0102
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 8
 UID:event8 at example.local
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20060202T205834Z
-DTSTART;VALUE=DATE:20060107
-RECURRENCE-ID;RANGE=THISANDFUTURE;VALUE=DATE:20060104
+DTSTART;VALUE=DATE:$now.year.1:0107
+RECURRENCE-ID;RANGE=THISANDFUTURE;VALUE=DATE:$now.year.1:0104
 SUMMARY:event 8 bis
 UID:event8 at example.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060202T205536Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -8,7 +8,7 @@
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
 <C:comp-filter name="VALARM">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:comp-filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -8,7 +8,7 @@
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
 <C:comp-filter name="VALARM">
-<C:time-range start="20060101T224500Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T224500Z" end="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:comp-filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -8,7 +8,7 @@
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
 <C:comp-filter name="VALARM">
-<C:time-range start="20060103T000000Z" end="20060104T000000Z"/>
+<C:time-range start="$now.year.1:0103T000000Z" end="$now.year.1:0104T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:comp-filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -8,7 +8,7 @@
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
 <C:comp-filter name="VALARM">
-<C:time-range start="20060104T000000Z" end="20060105T000000Z"/>
+<C:time-range start="$now.year.1:0104T000000Z" end="$now.year.1:0105T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:comp-filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/alarmtimerangequery/5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -8,7 +8,7 @@
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VTODO">
 <C:comp-filter name="VALARM">
-<C:time-range start="20060101T140000Z" end="20060101T180000Z"/>
+<C:time-range start="$now.year.1:0101T140000Z" end="$now.year.1:0101T180000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:comp-filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/13.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/13.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/13.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -30,7 +30,7 @@
 <filter>
 <comp-filter name='VCALENDAR'>
 <comp-filter name='VEVENT'>
-<time-range start='20051219T000000Z' end='20061209T000000Z'/>
+<time-range start='$now.year.0:1219T000000Z' end='$now.year.1:1209T000000Z'/>
 <prop-filter name='CATEGORIES'>
 <text-match>cool</text-match>
 </prop-filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/14.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/14.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/14.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <filter>
 <comp-filter name='VCALENDAR'>
 <comp-filter name='VEVENT'>
-<time-range start='20051219T000000Z' end='20061209T000000Z'/>
+<time-range start='$now.year.0:1219T000000Z' end='$now.year.1:1209T000000Z'/>
 <prop-filter name='CATEGORIES'>
 <text-match>COOL</text-match>
 </prop-filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/freebusy/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/freebusy/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/freebusy/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<C:time-range start="20060101T000000Z" end="20060105T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0105T000000Z"/>
 </C:free-busy-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/freebusy/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/freebusy/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/freebusy/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<C:time-range start="20060107T000000Z" end="20060109T000000Z"/>
+<C:time-range start="$now.year.1:0107T000000Z" end="$now.year.1:0109T000000Z"/>
 </C:free-busy-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,13 +3,13 @@
 <D:prop>
 <D:getetag/>
 <C:calendar-data>
-<C:limit-recurrence-set start="20060102T000000Z" end="20060103T000000Z"/>
+<C:limit-recurrence-set start="$now.year.1:0102T000000Z" end="$now.year.1:0103T000000Z"/>
 </C:calendar-data>
 </D:prop>
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z" end="20060103T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z" end="$now.year.1:0103T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/10.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/10.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/10.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,13 +3,13 @@
     <D:prop xmlns:D="DAV:">
         <C:calendar-data>
             <C:comp name="VCALENDAR"/>
-            <C:expand end="20081024T060000Z" start="20081018T060000Z"/>
+            <C:expand end="$now.year.2:1024T060000Z" start="$now.year.2:1018T060000Z"/>
         </C:calendar-data>
     </D:prop>
     <C:filter>
         <C:comp-filter name="VCALENDAR">
             <C:comp-filter name="VEVENT">
-                <C:time-range end="20081024T060000Z" start="20081018T060000Z"/>
+                <C:time-range end="$now.year.2:1024T060000Z" start="$now.year.2:1018T060000Z"/>
             </C:comp-filter>
         </C:comp-filter>
     </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <D:prop>
 <D:getetag/>
 <C:calendar-data>
-<C:limit-recurrence-set start="20060102T000000Z" end="20060105T000000Z"/>
+<C:limit-recurrence-set start="$now.year.1:0102T000000Z" end="$now.year.1:0105T000000Z"/>
 <C:comp name="VCALENDAR">
 <C:allprop/>
 <C:allcomp/>
@@ -13,7 +13,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z" end="20060103T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z" end="$now.year.1:0103T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <prop xmlns='DAV:'>
 <getetag/>
 <calendar-data xmlns='urn:ietf:params:xml:ns:caldav'>
-<expand start='20060102T000000Z' end='20060105T000000Z'/>
+<expand start='$now.year.1:0102T000000Z' end='$now.year.1:0105T000000Z'/>
 <comp name='VCALENDAR'>
 <allprop/>
 <comp name='VEVENT'>
@@ -30,7 +30,7 @@
 <filter>
 <comp-filter name='VCALENDAR'>
 <comp-filter name='VEVENT'>
-<time-range start='20060102T000000Z' end='20060105T000000Z'/>
+<time-range start='$now.year.1:0102T000000Z' end='$now.year.1:0105T000000Z'/>
 </comp-filter>
 </comp-filter>
 </filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,13 +3,13 @@
 <D:prop>
 <D:getetag/>
 <C:calendar-data>
-<C:expand start="20060102T000000Z" end="20060106T000000Z"/>
+<C:expand start="$now.year.1:0102T000000Z" end="$now.year.1:0106T000000Z"/>
 </C:calendar-data>
 </D:prop>
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z" end="20060105T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z" end="$now.year.1:0105T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <D:prop>
 <D:getetag/>
 <C:calendar-data>
-<C:limit-freebusy-set start="20060108T120000Z" end="20060108T180000Z"/>
+<C:limit-freebusy-set start="$now.year.1:0108T120000Z" end="$now.year.1:0108T180000Z"/>
 <C:comp name="VCALENDAR">
 <C:allprop/>
 <C:allcomp/>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/6.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/6.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,13 +3,13 @@
     <D:prop xmlns:D="DAV:">
         <C:calendar-data>
             <C:comp name="VCALENDAR"/>
-            <C:expand end="20081024T060000Z" start="20081019T060000Z"/>
+            <C:expand end="$now.year.2:1024T060000Z" start="$now.year.2:1019T060000Z"/>
         </C:calendar-data>
     </D:prop>
     <C:filter>
         <C:comp-filter name="VCALENDAR">
             <C:comp-filter name="VEVENT">
-                <C:time-range end="20081024T060000Z" start="20081019T060000Z"/>
+                <C:time-range end="$now.year.2:1024T060000Z" start="$now.year.2:1019T060000Z"/>
             </C:comp-filter>
         </C:comp-filter>
     </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/7.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/7.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,13 +3,13 @@
     <D:prop xmlns:D="DAV:">
         <C:calendar-data>
             <C:comp name="VCALENDAR"/>
-            <C:expand end="20081018T070000Z" start="20081018T060000Z"/>
+            <C:expand end="$now.year.2:1018T070000Z" start="$now.year.2:1018T060000Z"/>
         </C:calendar-data>
     </D:prop>
     <C:filter>
         <C:comp-filter name="VCALENDAR">
             <C:comp-filter name="VEVENT">
-                <C:time-range end="20081024T060000Z" start="20081018T060000Z"/>
+                <C:time-range end="$now.year.2:1024T060000Z" start="$now.year.2:1018T060000Z"/>
             </C:comp-filter>
         </C:comp-filter>
     </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/8.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/8.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/8.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <prop xmlns='DAV:'>
 <getetag/>
 <calendar-data xmlns='urn:ietf:params:xml:ns:caldav'>
-<expand start='20060102T000000Z' end='20060105T000000Z'/>
+<expand start='$now.year.1:0102T000000Z' end='$now.year.1:0105T000000Z'/>
 <comp name='VCALENDAR'>
 <allprop/>
 <comp name='VEVENT'>
@@ -31,7 +31,7 @@
 <filter>
 <comp-filter name='VCALENDAR'>
 <comp-filter name='VEVENT'>
-<time-range start='20060102T000000Z' end='20060105T000000Z'/>
+<time-range start='$now.year.1:0102T000000Z' end='$now.year.1:0105T000000Z'/>
 <prop-filter name="SUMMARY">
 <text-match>event 6</text-match>
 </prop-filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/9.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/9.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/9.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,13 +3,13 @@
 <prop xmlns='DAV:'>
 <getetag/>
 <calendar-data xmlns='urn:ietf:params:xml:ns:caldav'>
-<expand start='20110101T000000Z' end='20110110T000000Z'/>
+<expand start='$now.year.3:0101T000000Z' end='$now.year.3:0110T000000Z'/>
 </calendar-data>
 </prop>
 <filter>
 <comp-filter name='VCALENDAR'>
 <comp-filter name='VEVENT'>
-<time-range start='20110101T000000Z' end='20110110T000000Z'/>
+<time-range start='$now.year.3:0101T000000Z' end='$now.year.3:0110T000000Z'/>
 </comp-filter>
 </comp-filter>
 </filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/10.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/10.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/10.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060108T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T100000
 DURATION:PT1H
 SUMMARY:event 10
 UID:54E181BC7CCC373042B28842-10 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/102.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/102.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/102.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T151524Z
-DUE;TZID=US/Eastern:20060101T110000
+DUE;TZID=US/Eastern:$now.year.1:0101T110000
 STATUS:NEEDS-ACTION
 SUMMARY:Task 2
 UID:task02 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/103.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/103.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/103.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T151542Z
-DTSTART;TZID=US/Pacific:20060101T130000
+DTSTART;TZID=US/Pacific:$now.year.1:0101T130000
 DURATION:PT1H
 STATUS:NEEDS-ACTION
 SUMMARY:TASK 3

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/104.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/104.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/104.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T151524Z
-DUE;TZID=US/Eastern:20060103T110000
+DUE;TZID=US/Eastern:$now.year.1:0103T110000
 STATUS:NEEDS-ACTION
 SUMMARY:Task 4
 UID:task04 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/105.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/105.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/105.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T151542Z
-DTSTART;TZID=US/Pacific:20060104T130000
+DTSTART;TZID=US/Pacific:$now.year.1:0104T130000
 DURATION:P2D
 STATUS:NEEDS-ACTION
 SUMMARY:TASK 5

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/106.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/106.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/106.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T151524Z
-DUE;TZID=US/Eastern:20060102T110000
+DUE;TZID=US/Eastern:$now.year.1:0102T110000
 RRULE:FREQ=DAILY;COUNT=5
 STATUS:NEEDS-ACTION
 SUMMARY:Task 6

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/11.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/11.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/11.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060108T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T110000
 DURATION:PT1H
 SUMMARY:event 11
 UID:54E181BC7CCC373042B28842-11 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/12.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/12.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/12.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060108T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T110000
 DURATION:PT1H
 STATUS:TENTATIVE
 SUMMARY:event 12

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/13.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/13.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/13.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060108T150000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T150000
 DURATION:PT1H
 STATUS:CANCELLED
 SUMMARY:event 13

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/14.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/14.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/14.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060108T170000
+DTSTART;TZID=US/Eastern:$now.year.1:0108T170000
 DURATION:PT1H
 TRANSP:TRANSPARENT
 SUMMARY:event 14

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/15.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/15.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/15.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,11 +4,11 @@
 VERSION:2.0
 BEGIN:VFREEBUSY
 DTSTAMP:20051222T205953Z
-DTSTART:20060108T050000Z
-DTEND:20060109T050000Z
-FREEBUSY:20060108T163000Z/PT1H30M,20060108T190000Z/PT30M
-FREEBUSY;FBTYPE="BUSY-UNAVAILABLE":20060108T130000Z/PT2H
-FREEBUSY;FBTYPE="BUSY-TENTATIVE":20060108T210000Z/PT30M
+DTSTART:$now.year.1:0108T050000Z
+DTEND:$now.year.1:0109T050000Z
+FREEBUSY:$now.year.1:0108T163000Z/PT1H30M,$now.year.1:0108T190000Z/PT30M
+FREEBUSY;FBTYPE="BUSY-UNAVAILABLE":$now.year.1:0108T130000Z/PT2H
+FREEBUSY;FBTYPE="BUSY-TENTATIVE":$now.year.1:0108T210000Z/PT30M
 UID:bogus at example.com
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/16.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/16.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/16.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,11 +4,11 @@
 VERSION:2.0
 BEGIN:VFREEBUSY
 DTSTAMP:20051222T205953Z
-DTSTART:20060108T050000Z
-DTEND:20060109T050000Z
-FREEBUSY:20060108T200000Z/PT30M
-FREEBUSY;FBTYPE="BUSY-UNAVAILABLE":20060108T150000Z/PT2H
-FREEBUSY;FBTYPE="BUSY-TENTATIVE":20060108T170000Z/PT30M
+DTSTART:$now.year.1:0108T050000Z
+DTEND:$now.year.1:0109T050000Z
+FREEBUSY:$now.year.1:0108T200000Z/PT30M
+FREEBUSY;FBTYPE="BUSY-UNAVAILABLE":$now.year.1:0108T150000Z/PT2H
+FREEBUSY;FBTYPE="BUSY-TENTATIVE":$now.year.1:0108T170000Z/PT30M
 UID:bogus-16 at example.com
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/17.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/17.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/17.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,11 +4,11 @@
 VERSION:2.0
 BEGIN:VFREEBUSY
 DTSTAMP:20051222T205953Z
-DTSTART:20060108T050000Z
-DTEND:20060109T050000Z
-FREEBUSY:20060108T203000Z/PT30M
-FREEBUSY;FBTYPE="BUSY-UNAVAILABLE":20060108T173000Z/PT30M
-FREEBUSY;FBTYPE="BUSY-TENTATIVE":20060108T213000Z/PT30M
+DTSTART:$now.year.1:0108T050000Z
+DTEND:$now.year.1:0109T050000Z
+FREEBUSY:$now.year.1:0108T203000Z/PT30M
+FREEBUSY;FBTYPE="BUSY-UNAVAILABLE":$now.year.1:0108T173000Z/PT30M
+FREEBUSY;FBTYPE="BUSY-TENTATIVE":$now.year.1:0108T213000Z/PT30M
 UID:bogus-17 at example.com
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/18.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/18.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/18.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,7 +5,7 @@
 BEGIN:VEVENT
 DTSTAMP:20081017T205953Z
 CREATED:20081017T150000Z
-DTSTART;VALUE=DATE:20081017
+DTSTART;VALUE=DATE:$now.year.2:1017
 SUMMARY:event 1
 UID:18.ics at ninevah.local
 RRULE:FREQ=DAILY;COUNT=2

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/19.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/19.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/19.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210412Z
 CREATED:20060102T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 RRULE:FREQ=MONTHLY
 SUMMARY:monthly event

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210052Z
 CREATED:20060101T160000Z
-DTSTART;TZID=US/Mountain:20060101T110000
+DTSTART;TZID=US/Mountain:$now.year.1:0101T110000
 DURATION:PT1H
 SUMMARY:event 2
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/20.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/20.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/20.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20050101T140000Z
 CREATED:20050101T150000Z
-DTSTART;TZID=US/Eastern:20200101T100000
+DTSTART;TZID=US/Eastern:$now.year.10:0101T100000
 DURATION:PT1H
 SUMMARY:event 18
 UID:54E181BC7CCC373042B28842-18 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/21.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/21.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/21.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20050101T140000Z
 CREATED:20050101T150000Z
-DTSTART;TZID=US/Eastern:20200101T100000
+DTSTART;TZID=US/Eastern:$now.year.8:0102T100000
 DURATION:PT1H
 RRULE:FREQ=YEARLY
 SUMMARY:event 19

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/22.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/22.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/22.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,9 +23,9 @@
 BEGIN:VEVENT
 DTSTAMP:20050101T140000Z
 CREATED:20050101T150000Z
-DTSTART;TZID=US/Eastern:20200101T100000
+DTSTART;TZID=US/Eastern:$now.year.10:0101T100000
 DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20200101T100000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.10:0101T100000
 SUMMARY:event 20
 UID:54E181BC7CCC373042B28842-20 at ninevah.local
 CATEGORIES:cool

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/23.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/23.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,23 +21,23 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:DAFCEADF-A646-4D71-B6A8-E3C090849206
-DTSTART;TZID=America/New_York:20091119T100000
-DTEND;TZID=America/New_York:20091119T110000
+DTSTART;TZID=America/New_York:$now.year.2:1119T100000
+DTEND;TZID=America/New_York:$now.year.2:1119T110000
 ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=$email1:;PARTSTAT=AC
  CEPTED:$cuaddrurn1:
 CREATED:20091118T034738Z
 DTSTAMP:20091118T034759Z
 ORGANIZER;CN=User 01;EMAIL=$email1::$cuaddrurn1:
-RRULE:FREQ=DAILY;COUNT=400
+RRULE:FREQ=DAILY;COUNT=20
 SEQUENCE:3
 SUMMARY:New Event
 TRANSP:OPAQUE
 END:VEVENT
 BEGIN:VEVENT
 UID:DAFCEADF-A646-4D71-B6A8-E3C090849206
-RECURRENCE-ID;TZID=America/New_York:20091120T100000
-DTSTART;TZID=America/New_York:20091119T120000
-DTEND;TZID=America/New_York:20091119T130000
+RECURRENCE-ID;TZID=America/New_York:$now.year.2:1120T100000
+DTSTART;TZID=America/New_York:$now.year.2:1119T120000
+DTEND;TZID=America/New_York:$now.year.2:1119T130000
 ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=$email1:;PARTSTAT=AC
  CEPTED:$cuaddrurn1:
 CREATED:20091118T034738Z

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/24.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/24.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/24.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,10 +23,10 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20110101T120000
+DTSTART;TZID=US/Eastern:$now.year.3:0101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=4
-EXDATE;TZID=US/Eastern:20110101T120000
+EXDATE;TZID=US/Eastern:$now.year.3:0101T120000
 SUMMARY:event 24
 UID:54E181BC7CCC373042B28842-24 at ninevah.local
 CATEGORIES:cool

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/25.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/25.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/25.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20110101T140000
+DTSTART;TZID=US/Eastern:$now.year.3:0101T140000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=2
 SUMMARY:event 25

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210146Z
 CREATED:20060101T210000Z
-DTSTART;TZID=US/Pacific:20060101T130000
+DTSTART;TZID=US/Pacific:$now.year.1:0101T130000
 DURATION:PT1H
 LAST-MODIFIED:20051222T210203Z
 SEQUENCE:1

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210310Z
 CREATED:20060101T230000Z
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 SUMMARY:event 4
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210412Z
 CREATED:20060102T150000Z
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 5

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/6.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/6.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/6.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210507Z
 CREATED:20060102T190000Z
-DTSTART;TZID=US/Eastern:20060102T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T140000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 6
@@ -34,9 +34,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210507Z
 UID:F5B811E00073B22BA6B87551 at ninevah.local
-RECURRENCE-ID;TZID=US/Eastern:20060104T140000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T140000
 CREATED:20060102T190000Z
-DTSTART;TZID=US/Eastern:20060104T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T160000
 DURATION:PT1H
 SUMMARY:event 6 changed
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/7.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/7.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/7.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210507Z
 CREATED:20060102T230000Z
-DTSTART;TZID=US/Eastern:20060102T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T180000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:event 7
@@ -38,9 +38,9 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T210507Z
 UID:F5B811E00073B22BA6B87562 at ninevah.local
-RECURRENCE-ID;RANGE=THISANDFUTURE;TZID=US/Eastern:20060104T180000
+RECURRENCE-ID;RANGE=THISANDFUTURE;TZID=US/Eastern:$now.year.1:0104T180000
 CREATED:20060102T230000Z
-DTSTART;TZID=US/Eastern:20060104T200000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T200000
 DURATION:PT1H
 SUMMARY:event 7 changed
 DESCRIPTION:Some notes

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/8.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/8.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/8.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060107T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0107T100000
 DURATION:PT1H
 SUMMARY:event 8
 UID:54E181BC7CCC373042B28842-8 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/9.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/9.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/9.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060107T103000
+DTSTART;TZID=US/Eastern:$now.year.1:0107T103000
 DURATION:PT1H
 SUMMARY:event 9
 UID:54E181BC7CCC373042B28842-9 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/1.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/1.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z" end="20060103T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z" end="$now.year.1:0103T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/10.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/10.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/10.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range end="20060103T000000Z"/>
+<C:time-range end="$now.year.1:0103T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/101.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/101.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/101.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VTODO">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/102.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/102.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/102.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VTODO">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 <C:prop-filter name="SUMMARY">
 <C:text-match>2</C:text-match>
 </C:prop-filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/103.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/103.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/103.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VTODO">
-<C:time-range start="20060105T000000Z" end="20060106T000000Z"/>
+<C:time-range start="$now.year.1:0105T000000Z" end="$now.year.1:0106T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/104.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/104.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/104.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,13 +3,13 @@
     <D:prop xmlns:D="DAV:">
         <C:calendar-data>
             <C:comp name="VCALENDAR"/>
-            <C:expand end="20081023T065959Z" start="20081017T010000Z"/>
+            <C:expand end="$now.year.2:1023T065959Z" start="$now.year.2:1017T010000Z"/>
         </C:calendar-data>
     </D:prop>
     <C:filter>
         <C:comp-filter name="VCALENDAR">
             <C:comp-filter name="VEVENT">
-                <C:time-range end="20081023T065959Z" start="20081017T010000Z"/>
+                <C:time-range end="$now.year.2:1023T065959Z" start="$now.year.2:1017T010000Z"/>
             </C:comp-filter>
         </C:comp-filter>
     </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/12.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/12.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/12.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T000000Z" end="21000101T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.10:0101T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/13.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/13.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/13.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -2,13 +2,13 @@
 <C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:prop>
 <C:calendar-data>
-<C:expand start="20091119T000000Z" end="20091120T000000Z"/>
+<C:expand start="$now.year.2:1119T000000Z" end="$now.year.2:1120T000000Z"/>
 </C:calendar-data>
 </D:prop>
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20091119T000000Z" end="20091120T000000Z"/>
+<C:time-range start="$now.year.2:1119T000000Z" end="$now.year.2:1120T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/201.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/201.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/201.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,10 +7,10 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z" end="20060103T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z" end="$now.year.1:0103T000000Z"/>
 </C:comp-filter>
 <C:comp-filter name="VTODO">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/202.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/202.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/202.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,10 +7,10 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 <C:comp-filter name="VTODO">
-<C:time-range start="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/203.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/203.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/203.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 <C:comp-filter name="VTODO">
 </C:comp-filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/204.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/204.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/204.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,10 +7,10 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR" test="anyof">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z" end="20060103T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z" end="$now.year.1:0103T000000Z"/>
 </C:comp-filter>
 <C:comp-filter name="VTODO">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/205.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/205.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/205.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,10 +7,10 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR" test="anyof">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 <C:comp-filter name="VTODO">
-<C:time-range start="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/206.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/206.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/206.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR" test="anyof">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 <C:comp-filter name="VTODO">
 </C:comp-filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0101T000000Z" end="$now.year.1:0102T000000Z"/>
 <C:prop-filter name="SUMMARY">
 <C:text-match>1</C:text-match>
 </C:prop-filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060103T190000Z" end="20060103T200000Z"/>
+<C:time-range start="$now.year.1:0103T190000Z" end="$now.year.1:0103T200000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060104T210000Z" end="20060104T220000Z"/>
+<C:time-range start="$now.year.1:0104T210000Z" end="$now.year.1:0104T220000Z"/>
 <C:prop-filter name="SUMMARY">
 <C:text-match>changed</C:text-match>
 </C:prop-filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/6.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/6.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/6.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060103T190000Z" end="20060103T200000Z"/>
+<C:time-range start="$now.year.1:0103T190000Z" end="$now.year.1:0103T200000Z"/>
 <C:prop-filter name="SUMMARY">
 <C:text-match>changed</C:text-match>
 </C:prop-filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/7.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/7.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/7.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060106T010000Z" end="20060106T020000Z"/>
+<C:time-range start="$now.year.1:0106T010000Z" end="$now.year.1:0106T020000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/8.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/8.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/8.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 	<C:filter>
 		<C:comp-filter name="VCALENDAR">
 			<C:comp-filter name="VEVENT">
-				<C:time-range start="20250102T000000Z" end="20260103T000000Z"/>
+				<C:time-range start="$now.year.10:0102T000000Z" end="$now.year.10:0103T000000Z"/>
 			</C:comp-filter>
 		</C:comp-filter>
 	</C:filter>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/9.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/9.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/9.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 <C:filter>
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z"/>
+<C:time-range start="$now.year.1:0102T000000Z"/>
 </C:comp-filter>
 </C:comp-filter>
 </C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060424T170503Z
-DTSTART;TZID=US/Eastern:20060101T170000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T170000
 DURATION:PT1H
 SUMMARY:Meeting 4
 UID:Meeting4 at local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/17.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/17.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/17.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/18.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/18.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/18.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/19.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/19.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,8 +7,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddraltnoslash1:
 ATTENDEE;CN=$username2::$cuaddraltnoslash2:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060102T000000Z
+DTEND:$now.year.1:0102T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/2.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/2.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/20.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/20.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/21.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/21.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/22.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/22.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/23.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/23.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -8,8 +8,8 @@
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::urn:uuid:1234-56789
 ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060102T000000Z
+DTEND:$now.year.1:0102T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/24.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/24.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/24.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -46,8 +46,8 @@
 ATTENDEE:$cuaddr38:
 ATTENDEE:$cuaddr39:
 ATTENDEE:$cuaddr40:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060102T000000Z
+DTEND:$now.year.1:0102T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/5.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/5.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 DTSTAMP:20051222T205953Z
-DTSTART:20060108T050000Z
-DTEND:20060109T050000Z
+DTSTART:$now.year.1:0108T050000Z
+DTEND:$now.year.1:0109T050000Z
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
 ATTENDEE;CN=$username3::$cuaddr3:
@@ -14,8 +14,8 @@
 END:VFREEBUSY
 BEGIN:VFREEBUSY
 DTSTAMP:20051222T205953Z
-DTSTART:20060110T050000Z
-DTEND:20060111T050000Z
+DTSTART:$now.year.1:0110T050000Z
+DTEND:$now.year.1:0111T050000Z
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
 ATTENDEE;CN=$username3::$cuaddr3:

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/6.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/6.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/6.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -8,8 +8,8 @@
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
 ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060102T000000Z
+DTEND:$now.year.1:0102T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060424T170503Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SUMMARY:Meeting 1
 UID:Meeting1 at local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060424T170503Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 SUMMARY:Meeting 2
 UID:Meeting2 at local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedule/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedule/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedule/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20060424T170503Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT2H
 SUMMARY:Meeting 3
 UID:Meeting3 at local

Modified: CalDAVTester/trunk/Resource/CalDAV/scheduleacl/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/scheduleacl/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/scheduleacl/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,8 +7,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr2:
 ATTENDEE;CN=$username2::$cuaddr1:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060102T000000Z
+DTEND:$now.year.1:0102T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulecompatibility/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulenormal/1.ics	2012-06-08 01:08:35 UTC (rev 9340)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulecompatibility/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulecompatibility/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulenormal/4.ics	2012-06-08 01:08:35 UTC (rev 9340)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulecompatibility/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -24,7 +24,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:1234 at example.com-1

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,9 +7,9 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
+DTEND:$now.year.1:0103T000000Z
 X-CALENDARSERVER-MASK-UID:1234 at example.com-1
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/11.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/11.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,9 +7,9 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username2::$cuaddr2:
 ATTENDEE;CN=$username2::$cuaddr2:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
+DTEND:$now.year.1:0103T000000Z
 X-CALENDARSERVER-MASK-UID:1234 at example.com-1
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/12.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/12.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 SUMMARY:event 3
 UID:1234 at example.com-3

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/13.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/13.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T160000
 DURATION:PT1H
 SUMMARY:event 4
 UID:1234 at example.com-4

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/14.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/14.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 SUMMARY:event 5
 UID:1234 at example.com-5

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SUMMARY:event 2
 UID:1234 at example.com-2

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T140000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T140000
 DURATION:PT1H
 SUMMARY:event 3
 UID:1234 at example.com-3

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T160000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T160000
 DURATION:PT1H
 SUMMARY:event 4
 UID:1234 at example.com-4

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 SUMMARY:event 5
 UID:1234 at example.com-5

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,8 +7,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
+DTEND:$now.year.1:0103T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,9 +7,9 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
+DTEND:$now.year.1:0103T000000Z
 X-CALENDARSERVER-MASK-UID:1234 at example.com-3
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,9 +7,9 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
+DTEND:$now.year.1:0103T000000Z
 X-CALENDARSERVER-MASK-UID:1234 at example.com-1
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/schedulemaskuid/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,9 +7,9 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
+DTEND:$now.year.1:0103T000000Z
 X-CALENDARSERVER-MASK-UID:1234 at example.com-5
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/servertoserver/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/servertoserver/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/servertoserver/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:1234 at example.com-1

Modified: CalDAVTester/trunk/Resource/CalDAV/servertoserver/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/servertoserver/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/servertoserver/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SUMMARY:event 2
 UID:1234 at example.com-2

Modified: CalDAVTester/trunk/Resource/CalDAV/servertoserver/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/servertoserver/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/servertoserver/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=Remote 01:mailto:remote01 at example.org
 ATTENDEE;CN=$username1::$cuaddr1:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z
 END:VFREEBUSY

Modified: CalDAVTester/trunk/Resource/CalDAV/servertoserver/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/servertoserver/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/servertoserver/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z
 END:VFREEBUSY

Modified: CalDAVTester/trunk/Resource/CalDAV/servertoserver/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/servertoserver/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/servertoserver/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:20060110T231240Z-4011c71-187-6f73-1
-DTSTART:20060208T200000Z
+DTSTART:$now.year.1:0208T200000Z
 DTEND:20060208T210000Z
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/servertoserver/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/servertoserver/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/servertoserver/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:20060110T231240Z-4011c71-187-6f73-1-6
-DTSTART:20060102T200000Z
+DTSTART:$now.year.1:0102T200000Z
 DTEND:20060102T210000Z
 ATTENDEE;CN=$username1::$cuaddr1:
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/servertoserver/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/servertoserver/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/servertoserver/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:20060110T231240Z-4011c71-187-6f73-1-7
-DTSTART:20060102T220000Z
+DTSTART:$now.year.1:0102T220000Z
 DTEND:20060102T230000Z
 ATTENDEE;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/servertoserver/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/servertoserver/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/servertoserver/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -7,7 +7,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=Remote 01:mailto:remote01 at example.org
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z
 END:VFREEBUSY

Modified: CalDAVTester/trunk/Resource/CalDAV/servertoserver/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/servertoserver/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/servertoserver/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
 BEGIN:VEVENT
 UID:20060110T231240Z-4011c71-187-6f73-1
-DTSTART:20060102T200000Z
+DTSTART:$now.year.1:0102T200000Z
 DTEND:20060102T210000Z
 ATTENDEE;CN=Remote 01:mailto:remote01 at example.org
 CREATED:20060110T231240Z

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-ro-5 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-ro-6 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 6

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-ro-6 at ninevah.local
-DTSTART;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 6

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT4H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 4

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-7 at ninevah.local
-DTSTART;TZID=US/Eastern:20060201T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 7

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-7 at ninevah.local
-DTSTART;TZID=US/Eastern:20060201T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
 DURATION:PT7H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 7-1

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/9.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/9.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-9 at ninevah.local
-DTSTART;TZID=US/Eastern:20060201T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
 DURATION:PT7H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 9.ics

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/dropbox/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/dropbox/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/dropbox/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1 12345678901234567890123456789
 UID:54E181BC7CCC373042B28842

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/moves/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/moves/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/moves/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user02-uid1
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/moves/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/moves/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/moves/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user02-uid2
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/moves/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/moves/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/moves/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid3
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 3

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/moves/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/moves/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/moves/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user02-uid2
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/moves/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/moves/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/moves/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid5
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 5

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/moves/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/moves/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/moves/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid6
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 6

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/moves/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/moves/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/moves/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid7
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 7

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/moves/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/moves/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/moves/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid8
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 8

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/10.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/10.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-8 at ninevah.local
-DTSTART;TZID=US/Eastern:20060201T110000
+DTSTART;TZID=US/Eastern:$now.year.1:0201T110000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 8

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842-7 at ninevah.local
-DTSTART;TZID=US/Eastern:20060201T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 7

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid-2
-DTSTART;TZID=US/Eastern:20060101T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T080000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=10
 DTSTAMP:20051222T210310Z
@@ -33,8 +33,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060102T080000
-DTSTART;TZID=US/Eastern:20060102T080000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T080000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2
@@ -45,8 +45,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T090000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid-2
-DTSTART;TZID=US/Eastern:20060101T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T080000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=10
 DTSTAMP:20051222T210310Z
@@ -33,8 +33,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T090000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2
@@ -42,8 +42,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060102T080000
-DTSTART;TZID=US/Eastern:20060102T080000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T080000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid-2
-DTSTART;TZID=US/Eastern:20060101T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T080000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=10
 DTSTAMP:20051222T210310Z
@@ -29,8 +29,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T090000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid-2
-DTSTART;TZID=US/Eastern:20060101T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T080000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=10
 DTSTAMP:20051222T210310Z
@@ -33,8 +33,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060102T080000
-DTSTART;TZID=US/Eastern:20060102T080000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T080000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2
@@ -46,8 +46,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T090000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid-2
-DTSTART;TZID=US/Eastern:20060101T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T080000
 DURATION:PT1H
 RRULE:FREQ=DAILY;COUNT=10
 DTSTAMP:20051222T210310Z
@@ -29,8 +29,8 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T080000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T090000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1-inject

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user02-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2-inject

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user02-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 2-inject

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1.1

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1.1

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1.2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1.2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1.2

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -9,8 +9,8 @@
 ATTENDEE;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
 ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060105T000000Z
+DTEND:$now.year.1:0105T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -9,8 +9,8 @@
 ATTENDEE;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
 ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060105T000000Z
+DTEND:$now.year.1:0105T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -9,8 +9,8 @@
 ATTENDEE;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username2::$cuaddr2:
 ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000Z
+DTSTART:$now.year.1:0101T000000Z
 DTSTAMP:20060309T185105Z
-DTEND:20060105T000000Z
+DTEND:$now.year.1:0105T000000Z
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T120000
 DURATION:PT1H
 SUMMARY:event 2
 UID:54E181BC7CCC373042B28842-2 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060201T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060201T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/quota/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/quota/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/quota/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1 12345678901234567890123456789
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/quota/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/quota/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/quota/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 2 1234567890123456789012345678901234567890123456789012345678901234567890123456
 UID:54E181BC7CCC373042B28841 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/8.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/8.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare/shareedelete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare/shareedelete/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare/shareedelete/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -23,7 +23,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T210310Z
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 SUMMARY:event 4
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
@@ -33,7 +33,7 @@
 END:VEVENT
 BEGIN:VEVENT
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 4

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/6.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/6.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,14 +21,14 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 4

Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/7.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/webcal/rolled/7.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,14 +21,14 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 4

Modified: CalDAVTester/trunk/Resource/CalDAV/timezones/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/timezones/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/timezones/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -27,10 +27,10 @@
 SEQUENCE:4
 TRANSP:OPAQUE
 UID:B2695B03-1427-4B6A-9AC7-E9DB2A0C0DE8
-DTSTART;TZID=America/St_Johns:20070401T120000
+DTSTART;TZID=America/St_Johns:$now.year.0:0401T120000
 DTSTAMP:20071211T151055Z
 SUMMARY:April 1
 CREATED:20071211T151024Z
-DTEND;TZID=America/St_Johns:20070401T130000
+DTEND;TZID=America/St_Johns:$now.year.0:0401T130000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/timezones/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/timezones/2.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/timezones/2.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<C:time-range start="20070101T000000Z" end="20080101T000000Z"/>
+<C:time-range start="$now.year.0:0101T000000Z" end="$now.year.1:0101T000000Z"/>
 </C:free-busy-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/timezones/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/timezones/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/timezones/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -27,10 +27,10 @@
 SEQUENCE:9
 TRANSP:OPAQUE
 UID:F756C5EB-2D97-41AA-8E70-31AC0C0217DB
-DTSTART;TZID=America/St_Johns:20071210T120000
+DTSTART;TZID=America/St_Johns:$now.year.0:1210T120000
 DTSTAMP:20071211T151126Z
 SUMMARY:December 10 2007
 CREATED:20071210T202739Z
-DTEND;TZID=America/St_Johns:20071210T130000
+DTEND;TZID=America/St_Johns:$now.year.0:1210T130000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/timezones/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/timezones/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/timezones/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -31,10 +31,10 @@
 SEQUENCE:5
 TRANSP:OPAQUE
 UID:B2695B03-1427-4B6A-9AC7-E9DB2A0C0DE9
-DTSTART;TZID=Brazil/East:20070402T120000
+DTSTART;TZID=Brazil/East:$now.year.0:0402T120000
 DTSTAMP:20071211T163235Z
 SUMMARY:April 2
 CREATED:20071211T151024Z
-DTEND;TZID=Brazil/East:20070402T130000
+DTEND;TZID=Brazil/East:$now.year.0:0402T130000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/timezones/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/timezones/5.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/timezones/5.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -34,10 +34,10 @@
 SEQUENCE:12
 TRANSP:OPAQUE
 UID:F756C5EB-2D97-41AA-8E70-31AC0C0217DC
-DTSTART;TZID=Brazil/East:20071211T120000
+DTSTART;TZID=Brazil/East:$now.year.0:1211T120000
 DTSTAMP:20071211T163202Z
 SUMMARY:December 11 2007
 CREATED:20071210T202739Z
-DTEND;TZID=Brazil/East:20071211T130000
+DTEND;TZID=Brazil/East:$now.year.0:1211T130000
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/todo/10.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/todo/10.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/todo/10.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T151542Z
-DTSTART;TZID=US/Eastern:20060313T130000
+DTSTART;TZID=US/Eastern:$now.year.1:0313T130000
 DURATION:P3D
 STATUS:NEEDS-ACTION
 SUMMARY:TASK #10

Modified: CalDAVTester/trunk/Resource/CalDAV/todo/11.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/todo/11.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/todo/11.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VTODO
 DTSTAMP:20060313T151542Z
-DTSTART;TZID=US/Eastern:20060313T130000
+DTSTART;TZID=US/Eastern:$now.year.1:0313T130000
 DURATION:P3D
 STATUS:NEEDS-ACTION
 SUMMARY:TASK #11

Modified: CalDAVTester/trunk/Resource/CalDAV/todo/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/todo/3.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/todo/3.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20060313T145305Z
-DTSTART;VALUE=DATE:20060313
+DTSTART;VALUE=DATE:$now.year.1:0313
 DURATION:P3D
 STATUS:NEEDS-ACTION
 SUMMARY:Task #3

Modified: CalDAVTester/trunk/Resource/CalDAV/todo/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/todo/4.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/todo/4.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20060313T145305Z
-DTSTART;VALUE=DATE:20060313
+DTSTART;VALUE=DATE:$now.year.1:0313
 STATUS:NEEDS-ACTION
 SUMMARY:Task #4
 UID:7BC9FFBA66695DD1FA345FCC-04 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/todo/7.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/todo/7.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/todo/7.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20060313T145400Z
-DTSTART;VALUE=DATE:20060313
+DTSTART;VALUE=DATE:$now.year.1:0313
 DURATION:P3D
 STATUS:NEEDS-ACTION
 SUMMARY:Task #7

Modified: CalDAVTester/trunk/Resource/CalDAV/todo/8.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/todo/8.txt	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/todo/8.txt	2012-06-15 16:26:13 UTC (rev 9361)
@@ -4,7 +4,7 @@
 VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20060313T145400Z
-DTSTART;VALUE=DATE:20060313
+DTSTART;VALUE=DATE:$now.year.1:0313
 STATUS:NEEDS-ACTION
 SUMMARY:Task #8
 UID:9C49752BDA7E57A8FB4BEBE3 at example.local

Modified: CalDAVTester/trunk/Resource/CalDAV/webcal/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/webcal/1.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/webcal/1.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/webcal/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/webcal/2.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/webcal/2.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -22,7 +22,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 DTSTAMP:20051222T210310Z
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 SUMMARY:event 4
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local

Modified: CalDAVTester/trunk/Resource/CalDAV/webcal/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/webcal/3.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/webcal/3.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,14 +21,14 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:54E181BC7CCC373042B28842 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 4

Modified: CalDAVTester/trunk/Resource/CalDAV/webcal/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/webcal/4.ics	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/Resource/CalDAV/webcal/4.ics	2012-06-15 16:26:13 UTC (rev 9361)
@@ -21,7 +21,7 @@
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T180000
+DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 4

Deleted: CalDAVTester/trunk/buildperformer.py
===================================================================
--- CalDAVTester/trunk/buildperformer.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/buildperformer.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-#
-##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-#
-# Generate performance data based on runs of different scripts.
-#
-
-import performer
-import sys
-
-def human_readable(item, avg, stddev, total):
-    print "\t%s\t%.3f\t%.3f\t%.3f" % (item, avg, stddev, total)
-
-def main(logger):
-
-    performs = (
-        "scripts/buildperformance/get-small.xml",
-        "scripts/buildperformance/get-large.xml",
-        "scripts/buildperformance/put-small.xml",
-        "scripts/buildperformance/put-large.xml",
-    )
-    
-    for item in performs:
-        _ignore_pinfo, result = performer.runIt(item, silent=True)
-        if result[0][0] == -1.0 or result[0][1] == -1.0 or result[0][2] == -1.0:
-            print "Failed: got result -1.0 for test script %s" % (item,)
-            sys.exit(1)
-        logger(item[item.rfind("/")+1:item.rfind(".")], result[0][0], result[0][1], result[0][2])
-  
-if __name__ == "__main__":
-    main(human_readable)

Deleted: CalDAVTester/trunk/fsusage.py
===================================================================
--- CalDAVTester/trunk/fsusage.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/fsusage.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,97 +0,0 @@
-#!/usr/bin/env python
-#
-##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-#
-# Generates fs_usage counts for CalDAVTester script runs.
-#
-
-from src.manager import manager
-import getopt
-import os
-import signal
-import subprocess
-import sys
-import time
-
-def usage():
-    print """Usage: fsusage [options]
-Options:
-    -h       Print this help and exit
-    -f file  pid file of caldavd server
-"""
-
-def getFSUsage(count, testscript, runs, pid, sname):
-    tmpfile = "temp.fsusage.%02d" % (count,)
-    fd = open(tmpfile, "w")
-    cid = subprocess.Popen(["fs_usage", "-f", "filesys", "%s" %(pid,),], stdout=fd, stderr=fd).pid
-    
-    time.sleep(5)
-    
-    pname = None
-    fnames = [testscript]
-
-    mgr = manager(level=manager.LOG_NONE)
-    _ignore_result, _ignore_timing = mgr.runWithOptions(sname, pname, fnames, {})
-
-    os.kill(cid, signal.SIGTERM)
-
-    fd = open(tmpfile, "r")
-    ctr = 0
-    for _ignore_line in fd:
-        ctr += 1
-
-    return ctr / runs
-
-if __name__ == "__main__":
-
-    pidfile = "../CalendarServer/logs/caldavd.pid"
-    scriptsfile = "scripts/server/serverinfo.xml"
-    options, args = getopt.getopt(sys.argv[1:], "f:s:")
-
-    for option, value in options:
-        if option == "-h":
-            usage()
-            sys.exit(0)
-        elif option == "-f":
-            pidfile = value
-        elif option == "-s":
-            scriptsfile = value
-        else:
-            print "Unrecognized option: %s" % (option,)
-            usage()
-            raise ValueError
-
-    # First try to get pid of caldavd process
-    fd = open(pidfile, "r")
-    s = fd.read()
-    pid = int(s)
-    fd = None
-    
-    tests = (
-        ("performance/put/put-small.xml", 10, "put-small",),
-        ("performance/put/put-large.xml", 10, "put-large",),
-        ("performance/get/get-small.xml", 10, "get-small",),
-        ("performance/get/get-large.xml", 10, "get-large",),
-        ("performance/propfind/propfind-ctag.xml", 10, "propfind-ctag",),
-        ("performance/propfind/propfind-small.xml", 10, "propfind-small",),
-        ("performance/propfind/propfind-medium.xml", 10, "propfind-medium",),
-        ("performance/propfind/propfind-large.xml", 10, "propfind-large",),
-    )
-    
-    result = []
-    for ctr, test in enumerate(tests):
-        print "%s\t%s" % (test[2], getFSUsage(ctr, test[0], test[1], pid, scriptsfile),)

Deleted: CalDAVTester/trunk/loader.py
===================================================================
--- CalDAVTester/trunk/loader.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/loader.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,91 +0,0 @@
-#!/usr/bin/env python
-#
-##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-#
-# Runs a series of test suites inb parallel using a thread pool
-#
-
-import cPickle as pickle
-import getopt
-
-import sys
-
-from src.perfinfo import perfinfo
-
-def usage():
-    print """Usage: loader.py [options] <<script file>>
-Options:
-    -h       Print this help and exit
-    -n       Do not print out results
-    -o file  Write raw results to file
-    -i num   Numeric offset for test counter
-"""
-
-def runIt(script, silent=False):
-
-    pinfo = perfinfo.parseFile(script)
-
-    pinfo.doStart(silent)
-
-    allresults = pinfo.doLoadRamping()
-
-    pinfo.doEnd(silent)
-    
-    return allresults
-
-if __name__ == "__main__":
-
-    output_file = None
-    no_results = False
-    offset = 0
-
-    options, args = getopt.getopt(sys.argv[1:], "hno:i:")
-
-    for option, value in options:
-        if option == "-h":
-            usage()
-            sys.exit(0)
-        elif option == "-n":
-            no_results = True
-        elif option == "-o":
-            output_file = value
-        elif option == "-i":
-            offset = int(value)
-        else:
-            print "Unrecognized option: %s" % (option,)
-            usage()
-            raise ValueError
-
-    perfinfoname = "scripts/performance/perfinfo.xml"
-    if len(args) > 0:
-        perfinfoname = args[0]
-
-    allresults = perfinfo.runIt("load ramping", perfinfoname, silent=True, offset=offset)
-
-    if output_file:
-        fd = open(output_file, "w")
-        fd.write(pickle.dumps(allresults))
-        fd.close()
-
-    if not no_results:
-        # Print out averaged results.
-        print "\n\nClients\tReqs/sec\tResponse (secs)"
-        print "====================================================================="
-        for raw, clients, reqs, resp in allresults:
-            for x in raw:
-                print x
-            print "%d\t%.1f\t%.3f" % (clients, reqs, resp,)

Deleted: CalDAVTester/trunk/memusage.py
===================================================================
--- CalDAVTester/trunk/memusage.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/memusage.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,156 +0,0 @@
-#!/usr/bin/env python
-#
-##
-# Copyright (c) 2007 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-#
-from src.manager import manager
-import os
-import sys
-import getopt
- 
-# Runs a series of test suites a number of times and logs changes in process memory usage.
-#
-
-def getMemusage(pid):
-    """
-    
-    @param pid: numeric pid of process to get memory usage for
-    @type pid:  int
-    @retrun:    tuple of (RSS, VSZ) values for the process
-    """
-    
-    fd = os.popen("ps -l -p %d" %(pid,))
-    data = fd.read()
-    lines = data.split("\n")
-    procdata = lines[1].split()
-    return int(procdata[6]), int(procdata[7])
-
-def usage():
-    print """Usage: memusage.py [options]
-Options:
-    -h       Print this help and exit
-    -p file  pid file of caldavd server
-    -n num   number of times to execute each CalDAVTester script [1]
-    -N num   number of times to execute all scripts [1]
-    -m       monitor memory usage for each testsuite
-    -x       suppress per-script usage
-"""
-
-if __name__ == "__main__":
-
-    pidfile = "../CalendarServer/logs/caldavd.pid"
-    num = 1
-    loop = 1
-    sname = "scripts/server/serverinfo.xml"
-    pname = None
-    dname = "scripts/tests"
-    monitor = False
-    suppress = False
-
-    options, args = getopt.getopt(sys.argv[1:], "mN:n:p:x", [])
-
-    for option, value in options:
-        if option == "-h":
-            usage()
-            sys.exit(0)
-        elif option == "-m":
-            monitor = True
-        elif option == "-N":
-            loop = int(value)
-        elif option == "-n":
-            num = int(value)
-        elif option == "-p":
-            pidfile = value
-        elif option == "-x":
-            suppress = True
-        else:
-            print "Unrecognized option: %s" % (option,)
-            usage()
-            raise ValueError
-
-    # First try to get pid of caldavd process
-    fd = open(pidfile, "r")
-    s = fd.read()
-    pid = int(s)
-
-    fnames = []
-    fnames[:] = args
-    if fnames:
-        fnames = [os.path.join(dname, file) for file in fnames]
-    else:
-        files = os.listdir(dname)
-        for file in files:
-            if file.endswith(".xml"):
-                fnames.append(os.path.join(dname, file))
-
-        # Remove any server info file from files enuerated by --all
-        fnames[:] = [x for x in fnames if (x != sname) and (not pname or (x != pname))]
-
-    # Get initial memory usage for later comparison
-    overall_start_usage = getMemusage(pid)
-
-    for looper in range(loop):
-        print "-Overall loop: %d of %d" % (looper + 1, loop,)
-        data = []
-        for ctr, f in enumerate(fnames):
-            
-            print "--Script: %d of %d" % (ctr + 1, len(fnames),)
-    
-            # Get initial memory usage for later comparison
-            start_usage = getMemusage(pid)
-            
-            # Now run caldav tester scripts a number of times
-            for loopy in range(num):
-                if num > 1:
-                    print "---Loop %d of %d" % (loopy + 1, num,)
-                tester = manager()
-                if suppress:
-                    tester.logLevel = manager.LOG_NONE
-                else:
-                    tester.logLevel = manager.LOG_LOW
-                tester.runWithOptions(sname, pname, [f], {}, pid=pid, memUsage=monitor)
-            
-            # Get final memory usage
-            end_usage = getMemusage(pid)
-            
-            data.append((f, start_usage, end_usage,))
-        
-        if not suppress:
-            print ""
-            print "RESULTS"
-            print ""
-            for f, start_usage, end_usage in data:
-                # Print out the diff
-                print "*** Memory Usage for test: %s ***" % (f,)
-                print "".join([s.ljust(15) for s in ("", "RSS", "VSZ")])
-                print "".join([s.ljust(15) for s in ("-"*15, "-"*15, "-"*15)])
-                print "".join([s.ljust(15) for s in ("Start:", str(start_usage[1]), str(start_usage[0]))])
-                print "".join([s.ljust(15) for s in ("End:", str(end_usage[1]), str(end_usage[0]))])
-                print "".join([s.ljust(15) for s in ("Change:", str(end_usage[1] - start_usage[1]), str(end_usage[0] - start_usage[0]))])
-                print "".join([s.ljust(15) for s in ("%Change:", str(((end_usage[1] - start_usage[1]) * 100)/start_usage[1]), str(((end_usage[0] - start_usage[0]) * 100)/start_usage[0]))])
-                print ""
-        
-    # Get final memory usage
-    overall_end_usage = getMemusage(pid)
-
-    print "*** Overall Memory Usage ***"
-    print "".join([s.ljust(15) for s in ("", "RSS", "VSZ")])
-    print "".join([s.ljust(15) for s in ("-"*15, "-"*15, "-"*15)])
-    print "".join([s.ljust(15) for s in ("Start:", str(overall_start_usage[1]), str(overall_start_usage[0]))])
-    print "".join([s.ljust(15) for s in ("End:", str(overall_end_usage[1]), str(overall_end_usage[0]))])
-    print "".join([s.ljust(15) for s in ("Change:", str(overall_end_usage[1] - overall_start_usage[1]), str(overall_end_usage[0] - overall_start_usage[0]))])
-    print "".join([s.ljust(15) for s in ("%Change:", str(((overall_end_usage[1] - overall_start_usage[1]) * 100)/overall_start_usage[1]), str(((overall_end_usage[0] - overall_start_usage[0]) * 100)/overall_start_usage[0]))])
-    print ""

Deleted: CalDAVTester/trunk/monitor.py
===================================================================
--- CalDAVTester/trunk/monitor.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/monitor.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,342 +0,0 @@
-#!/usr/bin/env python
-#
-##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-#
-# Runs a series of test suites inb parallel using a thread pool
-#
-
-from getpass import getpass
-from StringIO import StringIO
-import itertools
-import getopt
-import socket
-import datetime
-import signal
-import sys
-import time
-import xml.dom.minidom
-
-from src.sendemail import sendemail
-from src.manager import manager
-from src.monitorinfo import monitorinfo
-import src.xmlDefs
-
-EX_INVALID_CONFIG_FILE = "Invalid Config File"
-
-class monitor(object):
-    
-    def __init__(self, infoname, logname, user, pswd):
-        self.infoname = infoname
-        self.user = user
-        self.pswd = pswd
-        self.minfo = None
-
-        self.logname = logname
-        if self.logname:
-            self.log = open(self.logname, "a")
-        else:
-            self.log = None
-            
-        self.running = True
-
-    def readXML(self):
-
-        # Open and parse the server config file
-        fd = open(self.infoname, "r")
-        doc = xml.dom.minidom.parse( fd )
-        fd.close()
-
-        # Verify that top-level element is correct
-        node = doc._get_documentElement()
-        if node._get_localName() != src.xmlDefs.ELEMENT_MONITORINFO:
-            raise EX_INVALID_CONFIG_FILE
-        if not node.hasChildNodes():
-            raise EX_INVALID_CONFIG_FILE
-        self.minfo = monitorinfo()
-        self.minfo.parseXML(node)
-    
-    def doScript(self, script, logger):
-        mgr = manager(level=manager.LOG_ERROR, log_file=logger)
-        return mgr.runWithOptions(
-            self.minfo.serverinfo,
-            "",
-            [script,],
-            {
-                "$userid1:"   : self.user,
-                "$pswd1:"     : self.pswd,
-                "$principal1:": "/principals/users/%s/" % (self.user,)
-            }
-        )
-
-    def doStart(self):
-        self.logtxt("Starting Monitor")
-
-        if self.minfo.startscript:
-            self.logtxt("Runnning start script %s" % (self.minfo.startscript,))
-            self.doScript(self.minfo.startscript)
-
-    def doEnd(self):
-        if self.minfo.endscript:
-            self.logtxt("Runnning end script %s" % (self.minfo.endscript,))
-            self.doScript(self.minfo.endscript)
-
-        self.logtxt("Stopped Monitor")
-        self.running = False
-
-    def doError(self, msg):
-        self.logtxt("Run exception: %s" % (msg,))
-
-    def doNotification(self, msg):
-        try:
-            sendemail(
-                fromaddr = ("Do Not Reply", self.minfo.notify_from),
-                toaddrs = [("", a) for a in self.minfo.notify],
-                subject = self.minfo.notify_subject,
-                body = self.minfo.notify_body % (msg,),
-            )
-        except Exception, e:
-            self.doError(str(e))
-
-    def logtxt(self, txt):
-        dt = str(datetime.datetime.now())
-        dt = dt[0:dt.rfind(".")]
-        if self.log:
-            self.log.write("[%s] %s\n" % (dt, txt,))
-            self.log.flush()
-        else:
-            print "[%s] %s" % (dt, txt,)
-    
-    def runLoop(self):
-        last_notify = 0
-        while(self.running):
-            time.sleep(self.minfo.period)
-            if not self.running:
-                break
-            logger = StringIO()
-            result, timing = m.doScript(self.minfo.testinfo, logger)
-            if not self.running:
-                break
-            if self.minfo.logging:
-                self.logtxt("Result: %d, Timing: %.3f" % (result, timing,))
-            if result != 0:
-                msg = "WARNING: request failed\n----\n%s\n----\n" % (logger.getvalue(),)
-                self.logtxt(msg)
-                if self.minfo.notify_request_failed and (time.time() - last_notify > self.minfo.notify_interval * 60):
-                    self.logtxt("Sending notification to %s" % (self.minfo.notify,))
-                    self.doNotification(msg)
-                    last_notify = time.time()
-            elif timing >= self.minfo.warningtime:
-                msg = "WARNING: request time (%.3f) exceeds limit (%.3f)" % (timing, self.minfo.warningtime,)
-                self.logtxt(msg)
-                if self.minfo.notify_time_exceeded and (time.time() - last_notify > self.minfo.notify_interval * 60):
-                    self.logtxt("Sending notification to %s" % (self.minfo.notify,))
-                    self.doNotification(msg)
-                    last_notify = time.time()
-
-    @staticmethod
-    def reportStart(html):
-        nowstr = str(datetime.datetime.now().replace(microsecond=0))
-        if html:
-            print """<html>
-<head><title>Server Status</title></head>
-<body>
-<h2>Server Status on %s</h2>
-""" % (nowstr,)
-        else:
-            print """Server Status on %s
-
-""" % (nowstr,)
-
-    @staticmethod
-    def reportEnd(html):
-        if html:
-            print """
-</body>
-</html>
-"""
-
-    def reportUptime(self, html):
-        
-        # Read in the logfile and count failures.
-        startstops = []
-        failures = 0
-        last_failure = None
-        fd = open(self.logname, "r")
-        for line in fd:
-            if line.find("Starting Monitor") != -1:
-                startstops.append(line)
-            elif line.find("Stopped Monitor") != -1:
-                startstops.append(line)
-            elif line.find("WARNING: request failed") != -1:
-                failures += 1
-                last_failure = line
-        
-        # Failed time = number of failures * monitor period (seconds)
-        downtime = int(failures * self.minfo.period)
-        
-        # Now calculate actual monitor run time
-        elapsed_time = 0
-        start = None
-        firststart = None
-        for item in startstops:
-            if start is None and item.find("Starting Monitor") != -1:
-                start = self.parse_date(item)
-                if firststart is None:
-                    firststart = self.parse_date(item)
-            elif start is not None and item.find("Stopped Monitor"):
-                end = self.parse_date(item)
-                delta = end - start
-                elapsed_time += delta.days * 24 * 60 * 60 + delta.seconds
-                start = None
-        
-        if start is not None:
-            end = datetime.datetime.now()
-            delta = end - start
-            elapsed_time += delta.days * 24 * 60 * 60 + delta.seconds
-        
-        uptime = elapsed_time - downtime
-
-        # Determine whether its up or down right now
-        if last_failure:
-            lastdowntime = self.parse_date(last_failure)
-            now = datetime.datetime.now()
-            diff = now - lastdowntime
-            diff = diff.days * 24 * 60 * 60 + diff.seconds
-            if diff < 2 * self.minfo.period:
-                status = "DOWN"
-            else:
-                status = "UP"
-        else:
-            status = "UP"
-        if html:
-            print """
-<h3>Server: %s</h3>
-<table>
-<tr><td>Since</td><td>%s</td></tr>
-<tr><td>Uptime</td><td>approx. %d (hours) / %d (days)</td></tr>
-<tr><td>Downtime</td><td>approx. %d (minutes) / %d (hours)</td></tr>
-<tr><td>Percentage</td><td>%.3f%%</td></tr>
-<tr><td> </td><td> <td></tr>
-<tr><td>Current Status</td><td>%s<td></tr>
-</table>
-
-""" % (self.minfo.name, str(firststart), uptime/60/60, uptime/60/60/24, downtime/60, downtime/60/60, ((uptime - downtime) * 100.0)/uptime, status)
-        else:
-            print """
-Server: %s
-    Since:      %s
-    Uptime:     approx. %d (hours) / %d (days)
-    Downtime:   approx. %d (minutes) / %d (hours)
-    Percentage: %.3f%%
-
-    Current Status: %s
-
-""" % (self.minfo.name, str(firststart), uptime/60/60, uptime/60/60/24, downtime/60, downtime/60/60, ((uptime - downtime) * 100.0)/uptime, status)
-
-    def parse_date(self, line):
-        
-        date = line[1:].split(']')[0]
-        return datetime.datetime(*(time.strptime(date, "%Y-%m-%d %H:%M:%S")[0:6]))
-
-def usage():
-    print """Usage: monitor.py [options] [<configfile>] [<logfile>]
-Options:
-    -h       Print this help and exit
-    -u       generate report of server uptime
-    --html   generate report as HTML
-    --user   user name for test account
-    --pswd   password
-"""
-
-if __name__ == "__main__":
-    
-    infoname = "scripts/monitoring/monitorinfo.xml"
-    uptime = False
-    html = False
-    user = None
-    pswd = None
-
-    options, args = getopt.getopt(sys.argv[1:], "huw", ["html", "user=", "pswd=",])
-
-    for option, value in options:
-        if option == "-h":
-            usage()
-            sys.exit(0)
-        elif option == "-u":
-            uptime = True
-        elif option == "--html":
-            html = True
-        elif option == "--user":
-            user = value
-        elif option == "--pswd":
-            pswd = value
-        else:
-            print "Unrecognized option: %s" % (option,)
-            usage()
-            raise ValueError
-
-    if uptime:
-        infoname = []
-        logname = []
-        for i in range(len(args)/2):
-            infoname.append(args[2 * i])
-            logname.append(args[2 * i + 1])
-
-    else:
-        if len(args) > 0:
-            infoname = args[0]
-            
-        if len(args) > 1:
-            logname = args[1]
-        else:
-            logname = None
-
-    if uptime:
-        user = ""
-        pswd = ""
-    else:
-        if not user:
-            user = raw_input("User: ")
-        if not pswd:
-            pswd = getpass("Password: ")
-    
-    if uptime:
-        monitor.reportStart(html)
-        for info, log in itertools.izip(infoname, logname):
-            m = monitor(info, log, user, pswd)
-            m.readXML()
-            m.reportUptime(html)
-        monitor.reportEnd(html)
-    else:
-        m = monitor(infoname, logname, user, pswd)
-        m.readXML()
-
-        def signalEnd(sig, frame):
-            m.doEnd()
-            sys.exit()
-    
-        signal.signal(signal.SIGINT, signalEnd)
-        socket.setdefaulttimeout(m.minfo.timeout)
-    
-        m.doStart()
-    
-        try:
-            m.runLoop()
-        except SystemExit:
-            pass
-        except Exception, e:
-            m.doError(str(e))

Deleted: CalDAVTester/trunk/multiloader.py
===================================================================
--- CalDAVTester/trunk/multiloader.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/multiloader.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,130 +0,0 @@
-#!/usr/bin/env python
-#
-##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-#
-# Runs a series of test suites inb parallel using a thread pool
-#
-
-import cPickle as pickle
-import getopt
-import time
-
-import os
-import sys
-
-def usage():
-    print """Usage: multiload.py [options] <<script file>>
-Options:
-    -h       Print this help and exit
-    -p num   Number of sub-process to create
-"""
-
-if __name__ == "__main__":
-
-    processes = 1
-
-    options, args = getopt.getopt(sys.argv[1:], "hp:")
-
-    for option, value in options:
-        if option == "-h":
-            usage()
-            sys.exit(0)
-        elif option == "-p":
-            processes = int(value)
-        else:
-            print "Unrecognized option: %s" % (option,)
-            usage()
-            raise ValueError
-
-    perfinfoname = "scripts/performance/perfinfo.xml"
-    if len(args) > 0:
-        perfinfoname = args[0]
-
-    pids = []
-    offset = 50
-    for i in range(processes):
-        output_file = "tmp.output.%s" % (i,)
-        if i == 0:
-            pids.append(os.spawnlp(os.P_NOWAIT, "python", "python", "loader.py", "-n", "-o", output_file, perfinfoname))
-        else:
-            pids.append(os.spawnlp(os.P_NOWAIT, "python", "python", "loader.py", "-n", "-o", output_file, "-i", "%d" % (i * offset), perfinfoname))
-        print "Created pid %s" % (pids[-1],)
-    
-    while sum(pids) != 0:
-        try:
-            for i, pid in enumerate(pids):
-                wpid, sts = os.waitpid(pid, os.WNOHANG)
-            if wpid and os.WIFEXITED(sts):
-                pids[i] = 0
-            time.sleep(10)
-        except OSError:
-            break
-
-    print "All child process complete. Aggregating data now..."
-
-    raw = []
-    clients = []
-    for i in range(processes):
-        output_file = "tmp.output.%s" % (i,)
-        fd = open(output_file, "r")
-        s = fd.read()
-        fd.close()
-        result = pickle.loads(s)
-        if len(raw) == 0:
-            for j in range(len(result)):
-                raw.append([])
-                clients.append(result[j][1])
-        for j in range(len(result)):
-            raw[j].append(result[j][0])
-    
-    allresults = []
-    for ctr, items in enumerate(raw):
-        aggregate = {}
-        for item in items:
-            for time, resp, num in item:
-                aggregate.setdefault(time, []).append((resp, num))
-        
-        averaged = {}
-        for key, values in aggregate.iteritems():
-            average = 0.0
-            nums = 0
-            for resp, num in values:
-                average += resp * num
-                nums += num
-            average /= nums
-            averaged[key] = (average, nums,)
-    
-        avkeys = averaged.keys()
-        avkeys.sort()
-        avkeys = avkeys[len(avkeys)/3:-len(avkeys)/3]
-        rawresults = []
-        average_time = 0.0
-        average_clients = 0.0
-        for i in avkeys:
-            rawresults.append((i, averaged[i][0], averaged[i][1]))
-            average_time += averaged[i][0]
-            average_clients += averaged[i][1]
-        average_time /= len(avkeys)
-        average_clients /= len(avkeys)
-    
-        allresults.append((clients[ctr] * processes, average_clients, average_time,))
-        
-    # Print out averaged results.
-    print "\n\nClients\tReqs/sec\tResponse (secs)"
-    print "====================================================================="
-    for clients, reqs, resp in allresults:
-        print "%d\t%.1f\t%.3f" % (clients, reqs, resp,)

Deleted: CalDAVTester/trunk/performer.py
===================================================================
--- CalDAVTester/trunk/performer.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/performer.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,216 +0,0 @@
-#!/usr/bin/env python
-#
-##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-#
-# Runs a series of test suites inb parallel using a thread pool
-#
-import sys
-
-from random import randrange
-from threading import Timer
-import math
-import time
-import xml.dom.minidom
-import src.xmlDefs
-
-from src.manager import manager
-from src.perfinfo import perfinfo
-
-EX_INVALID_CONFIG_FILE = "Invalid Config File"
-START_DELAY = 3.0
-
-def readXML(perfinfoname):
-
-    # Open and parse the server config file
-    fd = open(perfinfoname, "r")
-    doc = xml.dom.minidom.parse( fd )
-    fd.close()
-
-    # Verify that top-level element is correct
-    perfinfo_node = doc._get_documentElement()
-    if perfinfo_node._get_localName() != src.xmlDefs.ELEMENT_PERFINFO:
-        raise EX_INVALID_CONFIG_FILE
-    if not perfinfo_node.hasChildNodes():
-        raise EX_INVALID_CONFIG_FILE
-    pinfo = perfinfo()
-    pinfo.parseXML(perfinfo_node)
-    return pinfo
-
-def subs(str, i):
-    if "%" in str:
-        return str % i
-    else:
-        return str
-
-def doScript(pinfo, script):
-    # Create argument list that varies for each threaded client. Basically use a separate
-    # server account for each client.
-    def runner(*args):
-        """
-        Test runner method. 
-        @param *args:
-        """
-        
-        if pinfo.logging:
-            print "Start: %s" % (args[0]["moresubs"]["$userid1:"],)
-        try:
-            mgr = manager(level=manager.LOG_NONE)
-            _ignore_result, _ignore_timing = mgr.runWithOptions(*args[1:], **args[0])
-            if pinfo.logging:
-                print "Done: %s" % (args[0]["moresubs"]["$userid1:"],)
-        except Exception, e:
-            print "Thread run exception: %s" % (str(e),)
-
-    args = []
-    for i in range(1, pinfo.clients + 1):
-        moresubs = {}
-        for key, value in pinfo.subsdict.iteritems():
-            moresubs[key] = subs(value, i)
-        args.append(({"moresubs": moresubs}, subs(pinfo.serverinfo, i), "", [subs(script, i)]))
-    for arg in args:
-        runner(*arg)
-
-def doStart(pinfo, silent):
-    if pinfo.startscript:
-        if not silent:
-            print "Runnning start script %s" % (pinfo.startscript,)
-        doScript(pinfo, pinfo.startscript)
-
-def doEnd(pinfo, silent):
-    if pinfo.endscript:
-        if not silent:
-            print "Runnning end script %s" % (pinfo.endscript,)
-        doScript(pinfo, pinfo.endscript)
-
-def runIt(script, silent=False):
-
-    pinfo = readXML(script)
-
-    doStart(pinfo, silent)
-
-    # Cummulative results
-    allresults = []
-    
-    for test in pinfo.tests:
-        failed = [False]
-        result = [0.0, 0.0, 0.0]
-        if not silent:
-            print "|",
-        for _ignore_loop in range(test[2]):
-            if not silent:
-                print ".",
-            results = []
-        
-            def runner(*args):
-                """
-                Test runner method. 
-                @param *args:
-                """
-                
-                if pinfo.logging:
-                    print "Start: %s" % (args[0]["moresubs"]["$userid1:"],)
-                try:
-                    mgr = manager(level=manager.LOG_NONE)
-                    result, timing = mgr.runWithOptions(*args[1:], **args[0])
-                    if result > 0:
-                        failed[0] = True
-                    results.append(timing)
-                    if pinfo.logging:
-                        print "Done: %s" % (args[0]["moresubs"]["$userid1:"],)
-                except Exception, e:
-                    print "Thread run exception: %s" % (str(e),)
-        
-            # Create argument list that varies for each threaded client. Basically use a separate
-            # server account for each client.
-            args = []
-            for i in range(1, test[0] + 1):
-                moresubs = {}
-                for key, value in pinfo.subsdict.iteritems():
-                    moresubs[key] = subs(value, i)
-                args.append(({"moresubs": moresubs}, subs(pinfo.serverinfo, i), "", [subs(pinfo.testinfo, i)]))
-        
-            if pinfo.threads:
-                # Run threads by queuing up a set of timers set to start 5 seconds + random time
-                # after thread is actually started. The random time is spread over the interval
-                # we are testing over. Wait for all threads to finish.
-                timers = []
-                for arg in args:
-                    sleeper = START_DELAY + randrange(0, 100)/100.0 * test[1]
-                    timers.append(Timer(sleeper, runner, arg))
-            
-                startTime = time.time() + START_DELAY
-                for thread in timers:
-                    thread.start( )
-            
-                for thread in timers:
-                    thread.join(None)
-            else:
-                # Just execute each client request one after the other.
-                startTime = time.time()
-                for arg in args:
-                    runner(*arg)
-    
-            # Determine timing stats for this run
-            diffTime = time.time() - startTime
-
-            average = 0.0
-            for i in results:
-                average += i
-                if pinfo.logging:
-                    print i
-            average /= len(results)
-            
-            stddev = 0.0
-            for i in results:
-                stddev += (i - average) ** 2
-            stddev /= len(results)
-            stddev = math.sqrt(stddev)
-            
-            result[0] += average
-            result[1] += stddev
-            result[2] += diffTime
-        
-        # Average results from runs.
-        result[0] /= test[2]
-        result[1] /= test[2]
-        result[2] /= test[2]
-        
-        if failed[0]:
-            result = [-1.0, -1.0, -1.0]
-            
-        allresults.append(result)
-
-    if not silent:
-        print "|"
-    
-    doEnd(pinfo, silent)
-
-    return pinfo, allresults
-
-if __name__ == "__main__":
-
-    perfinfoname = "scripts/performance/perfinfo.xml"
-    if len(sys.argv) > 1:
-        perfinfoname = sys.argv[1]
-
-    pinfo, allresults = runIt(perfinfoname)
-
-    # Print out averaged results.
-    print "\n\nClients\tSpread\tReqs/sec\tAverage\t\tStd. Dev.\tTotal"
-    print "====================================================================="
-    for i in range(len(pinfo.tests)):
-        print "%.0f\t%.0f\t%.3f\t\t%.3f\t\t%.3f\t\t%.3f" % (pinfo.tests[i][0], pinfo.tests[i][1], pinfo.tests[i][0]/pinfo.tests[i][1], allresults[i][0], allresults[i][1], allresults[i][2],)

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -321,13 +321,13 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20060102T170000Z/20060102T180000Z</value>
+						<value>$now.year.1:0102T170000Z/$now.year.1:0102T180000Z</value>
 					</arg>
 					<arg>
 						<name>unavailable</name>
-						<value>20060101T000000Z/20060102T140000Z</value>
-						<value>20060102T170000Z/20060104T140000Z</value>
-						<value>20060104T170000Z/20060105T000000Z</value>
+						<value>$now.year.1:0101T000000Z/$now.year.1:0102T140000Z</value>
+						<value>$now.year.1:0102T170000Z/$now.year.1:0104T140000Z</value>
+						<value>$now.year.1:0104T170000Z/$now.year.1:0105T000000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -344,9 +344,9 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>unavailable</name>
-						<value>20060104T000000Z/20060104T140000Z</value>
-						<value>20060104T170000Z/20060106T170000Z</value>
-						<value>20060106T220000Z/20060108T000000Z</value>
+						<value>$now.year.1:0104T000000Z/$now.year.1:0104T140000Z</value>
+						<value>$now.year.1:0104T170000Z/$now.year.1:0106T170000Z</value>
+						<value>$now.year.1:0106T220000Z/$now.year.1:0108T000000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -385,12 +385,12 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>unavailable</name>
-						<value>20061001T000000Z/20061002T130000Z</value>
-						<value>20061002T210000Z/20061003T130000Z</value>
-						<value>20061003T210000Z/20061004T130000Z</value>
-						<value>20061004T210000Z/20061005T130000Z</value>
-						<value>20061005T210000Z/20061006T130000Z</value>
-						<value>20061006T210000Z/20061008T000000Z</value>
+						<value>$now.year.1:1001T000000Z/$now.year.1:1002T130000Z</value>
+						<value>$now.year.1:1002T210000Z/$now.year.1:1003T130000Z</value>
+						<value>$now.year.1:1003T210000Z/$now.year.1:1004T130000Z</value>
+						<value>$now.year.1:1004T210000Z/$now.year.1:1005T130000Z</value>
+						<value>$now.year.1:1005T210000Z/$now.year.1:1006T130000Z</value>
+						<value>$now.year.1:1006T210000Z/$now.year.1:1008T000000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -494,9 +494,9 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>FREEBUSY;FBTYPE=BUSY:20060102T170000Z/PT1H</value>
-						<value>FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20060102T000000Z/20060102T140000Z,2006010
- 2T220000Z/20060103T000000Z</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0102T170000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:$now.year.1:0102T000000Z/$now.year.1:0102T140000Z,$now.year.1:010
+ 2T220000Z/$now.year.1:0103T000000Z</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -459,13 +459,13 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20060101T000000Z/20060101T020000Z</value>
-						<value>20060101T050000Z/20060101T060000Z</value>
-						<value>20060101T080000Z/20060101T090000Z</value>
+						<value>$now.year.1:0101T000000Z/$now.year.1:0101T020000Z</value>
+						<value>$now.year.1:0101T050000Z/$now.year.1:0101T060000Z</value>
+						<value>$now.year.1:0101T080000Z/$now.year.1:0101T090000Z</value>
 					</arg>
 					<arg>
 						<name>tentative</name>
-						<value>20060101T000000Z/20060102T000000Z</value>
+						<value>$now.year.1:0101T000000Z/$now.year.1:0102T000000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -483,13 +483,13 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20060101T000000Z/20060101T010000Z</value>
-						<value>20060101T050000Z/20060101T070000Z</value>
-						<value>20060101T080000Z/20060101T090000Z</value>
+						<value>$now.year.1:0101T000000Z/$now.year.1:0101T010000Z</value>
+						<value>$now.year.1:0101T050000Z/$now.year.1:0101T070000Z</value>
+						<value>$now.year.1:0101T080000Z/$now.year.1:0101T090000Z</value>
 					</arg>
 					<arg>
 						<name>tentative</name>
-						<value>20060101T050000Z/20060102T000000Z</value>
+						<value>$now.year.1:0101T050000Z/$now.year.1:0102T000000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -511,13 +511,13 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20060101T000000Z/20060101T020000Z</value>
-						<value>20060101T050000Z/20060101T070000Z</value>
-						<value>20060101T080000Z/20060101T090000Z</value>
+						<value>$now.year.1:0101T000000Z/$now.year.1:0101T020000Z</value>
+						<value>$now.year.1:0101T050000Z/$now.year.1:0101T070000Z</value>
+						<value>$now.year.1:0101T080000Z/$now.year.1:0101T090000Z</value>
 					</arg>
 					<arg>
 						<name>tentative</name>
-						<value>20060101T000000Z/20060102T000000Z</value>
+						<value>$now.year.1:0101T000000Z/$now.year.1:0102T000000Z</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -1272,12 +1272,12 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>RECURRENCE-ID;TZID=US/Eastern:20060103T100000</value>
+						<value>RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
 						<value>FREQ=DAILY</value>
-						<value>RECURRENCE-ID;TZID=US/Eastern:20060104T100000</value>
+						<value>RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000</value>
 						<value>STATUS:CANCELLED</value>
 					</arg>
 				</verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -752,7 +752,7 @@
 					<arg>
 						<name>exists</name>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}attendee[=$cuaddrurn2:]</value>
-						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=20060102T150000Z]</value>
+						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=$now.year.1:0102T150000Z]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="ATTENDEE"]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property/{$CS:}changed-parameter[@name="PARTSTAT"]</value>
 					</arg>
@@ -931,8 +931,8 @@
 						<name>exists</name>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}attendee[=$cuaddrurn2:]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}master</value>
-						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=20060102T150000Z]</value>
-						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=20060104T150000Z]</value>
+						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=$now.year.1:0102T150000Z]</value>
+						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=$now.year.1:0104T150000Z]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="ATTENDEE"]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property/{$CS:}changed-parameter[@name="PARTSTAT"]</value>
 					</arg>
@@ -1008,8 +1008,8 @@
 					<arg>
 						<name>exists</name>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}master</value>
-						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}recurrenceid[=20060102T150000Z]</value>
-						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}recurrenceid[=20060104T150000Z]</value>
+						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}recurrenceid[=$now.year.1:0102T150000Z]</value>
+						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}recurrenceid[=$now.year.1:0104T150000Z]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="SUMMARY"]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="DTSTART"]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="DTEND"]</value>
@@ -1189,8 +1189,8 @@
 						<name>exists</name>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}attendee[=$cuaddrurn2:]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}master</value>
-						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=20060101T150000Z]</value>
-						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=20060104T150000Z]</value>
+						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=$now.year.1:0101T150000Z]</value>
+						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=$now.year.1:0104T150000Z]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="ATTENDEE"]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property/{$CS:}changed-parameter[@name="PARTSTAT"]</value>
 					</arg>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -1111,7 +1111,7 @@
 						<name>exists</name>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}attendee[=$cuaddrurn2:]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}master</value>
-						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=20060102T150000Z]</value>
+						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=$now.year.1:0102T150000Z]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="ATTENDEE"]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property/{$CS:}changed-parameter[@name="PARTSTAT"]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="X-CALENDARSERVER-PRIVATE-COMMENT"]</value>
@@ -1223,7 +1223,7 @@
 					<arg>
 						<name>exists</name>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}attendee[=$cuaddrurn2:]</value>
-						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=20060102T150000Z]</value>
+						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}recurrenceid[=$now.year.1:0102T150000Z]</value>
 						<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}reply/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="X-CALENDARSERVER-PRIVATE-COMMENT"]</value>
 					</arg>
 				</verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -557,7 +557,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -582,7 +582,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -607,7 +607,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -753,7 +753,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -778,7 +778,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -803,7 +803,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -842,7 +842,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -867,7 +867,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -909,7 +909,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PRIVATE</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event private access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -1096,7 +1096,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PRIVATE</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event private access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -1184,7 +1184,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 1</value>
 						<value>LOCATION:confidential 1</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -1211,7 +1211,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -1242,7 +1242,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -1410,7 +1410,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -1437,7 +1437,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -1468,7 +1468,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -1534,7 +1534,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 1</value>
 						<value>LOCATION:restricted 1</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -1561,7 +1561,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 1</value>
 						<value>LOCATION:restricted 1</value>
 					</arg>
@@ -1592,7 +1592,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 1</value>
 						<value>LOCATION:restricted 1</value>
 					</arg>
@@ -1763,7 +1763,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -1790,7 +1790,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -1821,7 +1821,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -1949,7 +1949,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -1975,7 +1975,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -2001,7 +2001,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -2030,7 +2030,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -2058,7 +2058,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -2090,7 +2090,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -2125,7 +2125,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -2153,7 +2153,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -2185,7 +2185,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -2227,7 +2227,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 				</verify>
 			</request>
@@ -2254,7 +2254,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -2286,7 +2286,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -2325,7 +2325,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 				</verify>
 			</request>
@@ -2354,7 +2354,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
@@ -2386,7 +2386,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
@@ -2483,7 +2483,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -2509,7 +2509,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -2535,7 +2535,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -2564,7 +2564,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -2592,7 +2592,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -2624,7 +2624,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -2659,7 +2659,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -2687,7 +2687,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -2719,7 +2719,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -2761,7 +2761,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 				</verify>
 			</request>
@@ -2788,7 +2788,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -2820,7 +2820,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -2859,7 +2859,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 				</verify>
 			</request>
@@ -2888,7 +2888,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
@@ -2920,7 +2920,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
@@ -3328,7 +3328,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -3354,7 +3354,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -3380,7 +3380,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -3409,7 +3409,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>BEGIN:VALARM</value>
@@ -3436,7 +3436,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -3466,7 +3466,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -3499,7 +3499,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 						<value>BEGIN:VALARM</value>
@@ -3526,7 +3526,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -3556,7 +3556,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -3734,7 +3734,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -3760,7 +3760,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -3786,7 +3786,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -3815,7 +3815,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>BEGIN:VALARM</value>
@@ -3842,7 +3842,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -3872,7 +3872,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
@@ -3905,7 +3905,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 						<value>BEGIN:VALARM</value>
@@ -3932,7 +3932,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -3962,7 +3962,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 					</arg>
@@ -4110,7 +4110,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -4158,7 +4158,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -4193,7 +4193,7 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 					</arg>
 				</verify>
 			</request>
@@ -4217,7 +4217,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event public access</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
@@ -4265,7 +4265,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
@@ -4293,7 +4293,7 @@
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
-						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
+						<value>DTSTART;TZID=US/Eastern:$now.year.1:0101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
 						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -2616,18 +2616,18 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20060101T150000Z/20060101T160000Z</value>
-						<value>20060101T180000Z/20060101T190000Z</value>
-						<value>20060101T210000Z/20060101T220000Z</value>
-						<value>20060101T230000Z/20060102T000000Z</value>
-						<value>20060102T150000Z/20060102T160000Z</value>
-						<value>20060103T150000Z/20060103T160000Z</value>
-						<value>20060104T150000Z/20060104T160000Z</value>
-						<value>20060102T190000Z/20060102T200000Z</value>
-						<value>20060103T190000Z/20060103T200000Z</value>
-						<value>20060104T210000Z/20060104T220000Z</value>
-						<value>20060102T230000Z/20060103T000000Z</value>
-						<value>20060103T230000Z/20060104T000000Z</value>
+						<value>$now.year.1:0101T150000Z/$now.year.1:0101T160000Z</value>
+						<value>$now.year.1:0101T180000Z/$now.year.1:0101T190000Z</value>
+						<value>$now.year.1:0101T210000Z/$now.year.1:0101T220000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
+						<value>$now.year.1:0102T150000Z/$now.year.1:0102T160000Z</value>
+						<value>$now.year.1:0103T150000Z/$now.year.1:0103T160000Z</value>
+						<value>$now.year.1:0104T150000Z/$now.year.1:0104T160000Z</value>
+						<value>$now.year.1:0102T190000Z/$now.year.1:0102T200000Z</value>
+						<value>$now.year.1:0103T190000Z/$now.year.1:0103T200000Z</value>
+						<value>$now.year.1:0104T210000Z/$now.year.1:0104T220000Z</value>
+						<value>$now.year.1:0102T230000Z/$now.year.1:0103T000000Z</value>
+						<value>$now.year.1:0103T230000Z/$now.year.1:0104T000000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -2655,19 +2655,19 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20060107T010000Z/20060107T020000Z</value>
-						<value>20060107T150000Z/20060107T163000Z</value>
-						<value>20060108T150000Z/20060108T180000Z</value>
-						<value>20060108T190000Z/20060108T193000Z</value>
+						<value>$now.year.1:0107T010000Z/$now.year.1:0107T020000Z</value>
+						<value>$now.year.1:0107T150000Z/$now.year.1:0107T163000Z</value>
+						<value>$now.year.1:0108T150000Z/$now.year.1:0108T180000Z</value>
+						<value>$now.year.1:0108T190000Z/$now.year.1:0108T193000Z</value>
 					</arg>
 					<arg>
 						<name>unavailable</name>
-						<value>20060108T130000Z/20060108T150000Z</value>
+						<value>$now.year.1:0108T130000Z/$now.year.1:0108T150000Z</value>
 					</arg>
 					<arg>
 						<name>tentative</name>
-						<value>20060108T160000Z/20060108T170000Z</value>
-						<value>20060108T210000Z/20060108T213000Z</value>
+						<value>$now.year.1:0108T160000Z/$now.year.1:0108T170000Z</value>
+						<value>$now.year.1:0108T210000Z/$now.year.1:0108T213000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -2677,13 +2677,13 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20060107T010000Z/20060107T020000Z</value>
-						<value>20060107T150000Z/20060107T163000Z</value>
-						<value>20060108T150000Z/20060108T170000Z</value>
+						<value>$now.year.1:0107T010000Z/$now.year.1:0107T020000Z</value>
+						<value>$now.year.1:0107T150000Z/$now.year.1:0107T163000Z</value>
+						<value>$now.year.1:0108T150000Z/$now.year.1:0108T170000Z</value>
 					</arg>
 					<arg>
 						<name>tentative</name>
-						<value>20060108T160000Z/20060108T170000Z</value>
+						<value>$now.year.1:0108T160000Z/$now.year.1:0108T170000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -2838,7 +2838,7 @@
 					<arg>
 						<name>contains</name>
 						<value>VEVENT</value>
-						<value>DTSTART;VALUE=DATE:20081017</value>
+						<value>DTSTART;VALUE=DATE:$now.year.2:1017</value>
 					</arg>
 				</verify>
 			</request>
@@ -2864,9 +2864,9 @@
 					<arg>
 						<name>contains</name>
 						<value>VEVENT</value>
-						<value>DTSTART;VALUE=DATE:20081017</value>
-						<value>DTSTART;VALUE=DATE:20081018</value>
-						<value>RECURRENCE-ID;VALUE=DATE:20081018</value>
+						<value>DTSTART;VALUE=DATE:$now.year.2:1017</value>
+						<value>DTSTART;VALUE=DATE:$now.year.2:1018</value>
+						<value>RECURRENCE-ID;VALUE=DATE:$now.year.2:1018</value>
 					</arg>
 				</verify>
 			</request>
@@ -2891,17 +2891,17 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>DTSTART:20060102T190000Z</value>
+						<value>DTSTART:$now.year.1:0102T190000Z</value>
 						<value>DURATION:PT1H</value>
-						<value>RECURRENCE-ID:20060103T190000Z</value>
-						<value>DTSTART:20060103T190000Z</value>
-						<value>RECURRENCE-ID:20060104T190000Z</value>
-						<value>DTSTART:20060104T210000Z</value>
+						<value>RECURRENCE-ID:$now.year.1:0103T190000Z</value>
+						<value>DTSTART:$now.year.1:0103T190000Z</value>
+						<value>RECURRENCE-ID:$now.year.1:0104T190000Z</value>
+						<value>DTSTART:$now.year.1:0104T210000Z</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
 						<value>VTIMEZONE</value>
-						<value>DTSTART:20060104T190000Z</value>
+						<value>DTSTART:$now.year.1:0104T190000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -2950,16 +2950,16 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>RECURRENCE-ID:20110102T170000Z</value>
-						<value>RECURRENCE-ID:20110103T170000Z</value>
-						<value>RECURRENCE-ID:20110104T170000Z</value>
-						<value>RECURRENCE-ID:20110102T190000Z</value>
+						<value>RECURRENCE-ID:$now.year.3:0102T170000Z</value>
+						<value>RECURRENCE-ID:$now.year.3:0103T170000Z</value>
+						<value>RECURRENCE-ID:$now.year.3:0104T170000Z</value>
+						<value>RECURRENCE-ID:$now.year.3:0102T190000Z</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>DTSTART:20110101T170000Z</value>
-						<value>RECURRENCE-ID:20110101T170000Z</value>
-						<value>RECURRENCE-ID:20110101T190000Z</value>
+						<value>DTSTART:$now.year.3:0101T170000Z</value>
+						<value>RECURRENCE-ID:$now.year.3:0101T170000Z</value>
+						<value>RECURRENCE-ID:$now.year.3:0101T190000Z</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/scheduleimplicit-compatability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/scheduleimplicit-compatability.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/scheduleimplicit-compatability.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -85,7 +85,7 @@
 				<ruri>$outboxpath1:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/schedulenormal/1.ics</filepath>
+					<filepath>Resource/CalDAV/schedulecompatibility/1.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -103,7 +103,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/schedulenormal/2.xml</filepath>
+					<filepath>Resource/CalDAV/schedulecompatibility/2.xml</filepath>
 				</data>
 				<verify>
 					<callback>multistatusItems</callback>
@@ -125,7 +125,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/schedulenormal/3.xml</filepath>
+					<filepath>Resource/CalDAV/schedulecompatibility/3.xml</filepath>
 				</data>
 				<verify>
 					<callback>multistatusItems</callback>
@@ -147,7 +147,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/schedulenormal/3.xml</filepath>
+					<filepath>Resource/CalDAV/schedulecompatibility/3.xml</filepath>
 				</data>
 				<verify>
 					<callback>multistatusItems</callback>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -578,8 +578,8 @@
 					<arg>
 						<name>contains</name>
 						<value>METHOD:REPLY</value>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T170000Z/PT1H,20060101T190000Z/PT1H,20060101T220000Z/PT1H</value>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0101T170000Z/PT1H,$now.year.1:0101T190000Z/PT1H,$now.year.1:0101T220000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0101T190000Z/PT2H,$now.year.1:0101T220000Z/PT1H</value>
 					</arg>
 					<arg>
 						<name>unwrap</name>
@@ -605,7 +605,7 @@
 					<arg>
 						<name>contains</name>
 						<value><![CDATA[<recipient-exists xmlns='urn:ietf:params:xml:ns:caldav'/>]]></value>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0101T190000Z/PT2H,$now.year.1:0101T220000Z/PT1H</value>
 					</arg>
 					<arg>
 						<name>unwrap</name>

Deleted: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostauto.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostauto.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,1382 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<caldavtest ignore-all="yes">
-	<description>Test POST method in CalDAV</description>
-
-	<require-feature>
-		<feature>caldav</feature>
-	</require-feature>
-
-	<start>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$outboxpath1:/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$inboxpath1:/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$outboxpath2:/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$inboxpath2:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$routboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rinboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rcalendarpath1:/</ruri>
-		</request>
-	</start>
-	
-	<test-suite name='POST non-recurring without conflict (no RSVP)' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/1.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/1.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/2.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/3.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-	
-	<test-suite name='POST non-recurring without conflict, rsvp=false' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/19.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/19.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/20.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-	
-	<test-suite name='Update to previous request - no auto-reply' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/4.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/21.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/5.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='Repeat request - no auto-reply' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/4.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>1</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>prefix</name>
-						<value/>
-					</arg>
-					<arg>
-						<name>okhrefs</name>
-						<value>$outboxpath1:/</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/21.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/5.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST non-recurring with conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/7.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/7.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>Two items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/8.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST recurring with conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/9.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/9.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>Two items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/10.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST recurring without conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/11.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/11.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/12.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/13.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-	
-	<test-suite name='POST non-recurring with recurring conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/14.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/14.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>Three items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>3</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/15.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST recurring with recurring conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/16.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/16.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>Three items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>3</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/17.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST cancel non-recurring' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>getctag on resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/ctag/1.xml</filepath>
-				</data>
-				<grabproperty>
-					<property>{http://calendarserver.org/ns/}getctag</property>
-					<variable>$calendarctag:</variable>
-				</grabproperty>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>getctag on resource01 inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/ctag/1.xml</filepath>
-				</data>
-				<grabproperty>
-					<property>{http://calendarserver.org/ns/}getctag</property>
-					<variable>$inboxctag:</variable>
-				</grabproperty>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/18.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>No item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath2:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleauto/18.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>Two items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='8' ignore='no'>
-			<description>No item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$routboxpath1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='9' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>6</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='10' ignore='no'>
-			<description>Test getctag on resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/ctag/1.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value>{http://calendarserver.org/ns/}getctag!$calendarctag:</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='11' ignore='no'>
-			<description>getctag on resource01 inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/ctag/1.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value>{http://calendarserver.org/ns/}getctag!$inboxctag:</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<end>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$outboxpath1:/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$inboxpath1:/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$outboxpath2:/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$inboxpath2:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$routboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rinboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rcalendarpath1:/</ruri>
-		</request>
-	</end>
-	
-</caldavtest>

Deleted: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurcancel.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurcancel.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurcancel.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,767 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<caldavtest ignore-all="yes">
-	<description>Test iTIP with recurrence instances</description>
-
-	<require-feature>
-		<feature>caldav</feature>
-	</require-feature>
-
-	<start>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$outboxpath1:/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$inboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$routboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rinboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rcalendarpath1:/</ruri>
-		</request>
-	</start>
-	
-	<test-suite name='POST recurring' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/1.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurcancel/2.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST cancel one instance' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/3.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurcancel/4.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST cancel multiple instances' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/5.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurcancel/6.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST cancel wrong SEQUENCE' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/7.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurcancel/6.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST cancel no match UID' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/8.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST recurring with overridden instances' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/9.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurcancel/10.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST cancel one overridden instance' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/11.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurcancel/12.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST cancel multiple instances' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/13.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurcancel/14.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST recurring instance only' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/15.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurcancel/16.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>Three items in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>3</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST cancel one overridden instance' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/17.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurcancel/18.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>Three items in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>3</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST cancel last overridden instance' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurcancel/19.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>Two items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>Three items in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>3</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<end>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$outboxpath1:/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$inboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$routboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rinboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rcalendarpath1:/</ruri>
-		</request>
-	</end>
-	
-</caldavtest>

Deleted: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurrequest.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurrequest.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurrequest.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,564 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<caldavtest ignore-all="yes">
-	<description>Test iTIP with recurrence instances</description>
-
-	<require-feature>
-		<feature>caldav</feature>
-	</require-feature>
-
-	<start>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$outboxpath1:/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$inboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$routboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rinboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rcalendarpath1:/</ruri>
-		</request>
-	</start>
-	
-	<test-suite name='POST recurring' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurrequest/1.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/2.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/3.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST modify one instance' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurrequest/4.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/5.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/6.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST modify two instances' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurrequest/7.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/8.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/9.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST modify two instances - one discarded' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurrequest/10.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/11.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/12.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST recurring instance only' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurrequest/13.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/14.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/15.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST recurring instance only added' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurrequest/16.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/17.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/18.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST recurring instance only changed' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurrequest/19.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/20.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/21.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='POST recurring multi-user/multi-instance' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurrequest/22.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurrequest/23.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<end>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$outboxpath1:/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$inboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$routboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rinboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rcalendarpath1:/</ruri>
-		</request>
-	</end>
-	
-</caldavtest>

Deleted: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurspecial.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurspecial.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostautorecurspecial.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,257 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<caldavtest ignore-all="yes">
-	<description>Test iTIP with recurrence instances</description>
-
-	<require-feature>
-		<feature>caldav</feature>
-	</require-feature>
-
-	<start>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$outboxpath1:/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$inboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$routboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rinboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rcalendarpath1:/</ruri>
-		</request>
-	</start>
-	
-	<test-suite name='POST recurring request/request/cancel' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do POST of 5-day recurrence</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurspecial/1.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurspecial/2.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>Do POST of 3rd-day override</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurspecial/3.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurspecial/4.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='8' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='9' ignore='no'>
-			<description>Do POST of 4th-day cancel</description>
-			<request>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/scheduleautorecurspecial/5.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='10' ignore='no'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>0</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='11' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$rcalendarpath1:/</ruri>
-				<verify>
-					<callback>calendarDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/scheduleautorecurspecial/6.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='12' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<end>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$outboxpath1:/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$inboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$routboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rinboxpath1:/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>$rcalendarpath1:/</ruri>
-		</request>
-	</end>
-	
-</caldavtest>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -193,8 +193,8 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H,20060101T170000Z/PT1H,20060101T
- 190000Z/PT1H,20060101T210000Z/PT1H,20060101T230000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0101T150000Z/PT1H,$now.year.1:0101T170000Z/PT1H,$now.year.1:0101T
+ 190000Z/PT1H,$now.year.1:0101T210000Z/PT1H,$now.year.1:0101T230000Z/PT1H</value>
 					</arg>
 				</verify>
 			</request>
@@ -215,8 +215,8 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H,20060101T170000Z/PT1H,20060101T
- 210000Z/PT1H,20060101T230000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0101T150000Z/PT1H,$now.year.1:0101T170000Z/PT1H,$now.year.1:0101T
+ 210000Z/PT1H,$now.year.1:0101T230000Z/PT1H</value>
 					</arg>
 				</verify>
 			</request>
@@ -237,8 +237,8 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H,20060101T170000Z/PT1H,20060101T
- 190000Z/PT1H,20060101T210000Z/PT1H,20060101T230000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0101T150000Z/PT1H,$now.year.1:0101T170000Z/PT1H,$now.year.1:0101T
+ 190000Z/PT1H,$now.year.1:0101T210000Z/PT1H,$now.year.1:0101T230000Z/PT1H</value>
 					</arg>
 				</verify>
 			</request>
@@ -259,8 +259,8 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H,20060101T170000Z/PT1H,20060101T
- 190000Z/PT1H,20060101T210000Z/PT1H,20060101T230000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0101T150000Z/PT1H,$now.year.1:0101T170000Z/PT1H,$now.year.1:0101T
+ 190000Z/PT1H,$now.year.1:0101T210000Z/PT1H,$now.year.1:0101T230000Z/PT1H</value>
 					</arg>
 				</verify>
 			</request>
@@ -284,8 +284,8 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H,20060101T170000Z/PT1H,20060101T
- 190000Z/PT1H,20060101T210000Z/PT1H,20060101T230000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0101T150000Z/PT1H,$now.year.1:0101T170000Z/PT1H,$now.year.1:0101T
+ 190000Z/PT1H,$now.year.1:0101T210000Z/PT1H,$now.year.1:0101T230000Z/PT1H</value>
 					</arg>
 				</verify>
 			</request>
@@ -306,8 +306,8 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T170000Z/PT1H,20060101T190000Z/PT1H,20060101T
- 210000Z/PT1H,20060101T230000Z/PT1H</value>
+						<value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0101T170000Z/PT1H,$now.year.1:0101T190000Z/PT1H,$now.year.1:0101T
+ 210000Z/PT1H,$now.year.1:0101T230000Z/PT1H</value>
 					</arg>
 				</verify>
 			</request>

Deleted: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostnormal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostnormal.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostnormal.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,144 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<caldavtest ignore-all="yes">
-	<description>Test normal POST operations in CalDAV</description>
-
-	<require-feature>
-		<feature>caldav</feature>
-	</require-feature>
-
-	<start>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$outboxpath1:/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$inboxpath1:/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$outboxpath2:/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$inboxpath2:/</ruri>
-		</request>
-		<request user="$userid3:" pswd="$pswd3:">
-			<method>DELETEALL</method>
-			<ruri>$outboxpath3:/</ruri>
-		</request>
-		<request user="$userid3:" pswd="$pswd3:">
-			<method>DELETEALL</method>
-			<ruri>$inboxpath3:/</ruri>
-		</request>
-	</start>
-	
-	<test-suite name="POSTs" ignore='no'>
-		<test name='1'>
-			<description>Initial REQUEST</description>
-			<request print-response='no'>
-				<method>POST</method>
-				<ruri>$outboxpath1:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/schedulenormal/1.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='2'>
-			<description>Make sure no resource exists</description>
-			<request print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$outboxpath1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>1</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/schedulenormal/2.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>prefix</name>
-						<value/>
-					</arg>
-					<arg>
-						<name>okhrefs</name>
-						<value>$outboxpath1:/</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3'>
-			<description>Make sure resource exists and properties are set</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$inboxpath2:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>1</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/schedulenormal/3.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4'>
-			<description>Make sure resource exists and properties are set</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$inboxpath3:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>1</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/schedulenormal/3.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-	
-	<end/>
-	
-</caldavtest>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -288,7 +288,7 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -306,7 +306,7 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -328,7 +328,7 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -346,7 +346,7 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -368,7 +368,7 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -386,7 +386,7 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -495,10 +495,10 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T130000Z/20060101T140000Z</value>
-						<value>20060101T230000Z/20060102T000000Z</value>
-						<value>20060103T140000Z/20060103T150000Z</value>
-						<value>20060104T130000Z/20060104T140000Z</value>
+						<value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
+						<value>$now.year.1:0103T140000Z/$now.year.1:0103T150000Z</value>
+						<value>$now.year.1:0104T130000Z/$now.year.1:0104T140000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -509,9 +509,9 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T130000Z/20060101T140000Z</value>
-						<value>20060102T130000Z/20060102T140000Z</value>
-						<value>20060104T130000Z/20060104T140000Z</value>
+						<value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+						<value>$now.year.1:0102T130000Z/$now.year.1:0102T140000Z</value>
+						<value>$now.year.1:0104T130000Z/$now.year.1:0104T140000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -522,11 +522,11 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T130000Z/20060101T140000Z</value>
-						<value>20060101T230000Z/20060102T000000Z</value>
-						<value>20060102T130000Z/20060102T140000Z</value>
-						<value>20060103T140000Z/20060103T150000Z</value>
-						<value>20060104T130000Z/20060104T140000Z</value>
+						<value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
+						<value>$now.year.1:0102T130000Z/$now.year.1:0102T140000Z</value>
+						<value>$now.year.1:0103T140000Z/$now.year.1:0103T150000Z</value>
+						<value>$now.year.1:0104T130000Z/$now.year.1:0104T140000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -548,10 +548,10 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T130000Z/20060101T140000Z</value>
-						<value>20060101T230000Z/20060102T000000Z</value>
-						<value>20060103T140000Z/20060103T150000Z</value>
-						<value>20060104T130000Z/20060104T140000Z</value>
+						<value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
+						<value>$now.year.1:0103T140000Z/$now.year.1:0103T150000Z</value>
+						<value>$now.year.1:0104T130000Z/$now.year.1:0104T140000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -562,9 +562,9 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T130000Z/20060101T140000Z</value>
-						<value>20060102T130000Z/20060102T140000Z</value>
-						<value>20060104T130000Z/20060104T140000Z</value>
+						<value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+						<value>$now.year.1:0102T130000Z/$now.year.1:0102T140000Z</value>
+						<value>$now.year.1:0104T130000Z/$now.year.1:0104T140000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -575,11 +575,11 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T130000Z/20060101T140000Z</value>
-						<value>20060101T230000Z/20060102T000000Z</value>
-						<value>20060102T130000Z/20060102T140000Z</value>
-						<value>20060103T140000Z/20060103T150000Z</value>
-						<value>20060104T130000Z/20060104T140000Z</value>
+						<value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
+						<value>$now.year.1:0102T130000Z/$now.year.1:0102T140000Z</value>
+						<value>$now.year.1:0103T140000Z/$now.year.1:0103T150000Z</value>
+						<value>$now.year.1:0104T130000Z/$now.year.1:0104T140000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -601,10 +601,10 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T130000Z/20060101T140000Z</value>
-						<value>20060101T230000Z/20060102T000000Z</value>
-						<value>20060103T140000Z/20060103T150000Z</value>
-						<value>20060104T130000Z/20060104T140000Z</value>
+						<value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
+						<value>$now.year.1:0103T140000Z/$now.year.1:0103T150000Z</value>
+						<value>$now.year.1:0104T130000Z/$now.year.1:0104T140000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -615,9 +615,9 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T130000Z/20060101T140000Z</value>
-						<value>20060102T130000Z/20060102T140000Z</value>
-						<value>20060104T130000Z/20060104T140000Z</value>
+						<value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+						<value>$now.year.1:0102T130000Z/$now.year.1:0102T140000Z</value>
+						<value>$now.year.1:0104T130000Z/$now.year.1:0104T140000Z</value>
 					</arg>
 				</verify>
 				<verify>
@@ -628,11 +628,11 @@
 					</arg>
 					<arg>
 						<name>busy</name>
-						<value>20060101T130000Z/20060101T140000Z</value>
-						<value>20060101T230000Z/20060102T000000Z</value>
-						<value>20060102T130000Z/20060102T140000Z</value>
-						<value>20060103T140000Z/20060103T150000Z</value>
-						<value>20060104T130000Z/20060104T140000Z</value>
+						<value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+						<value>$now.year.1:0101T230000Z/$now.year.1:0102T000000Z</value>
+						<value>$now.year.1:0102T130000Z/$now.year.1:0102T140000Z</value>
+						<value>$now.year.1:0103T140000Z/$now.year.1:0103T150000Z</value>
+						<value>$now.year.1:0104T130000Z/$now.year.1:0104T140000Z</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/timezones.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/timezones.xml	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/timezones.xml	2012-06-15 16:26:13 UTC (rev 9361)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20070401T143000Z/20070401T153000Z</value>
+						<value>$now.year.0:0401T143000Z/$now.year.0:0401T153000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -87,8 +87,8 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20070401T143000Z/20070401T153000Z</value>
-						<value>20071210T153000Z/20071210T163000Z</value>
+						<value>$now.year.0:0401T143000Z/$now.year.0:0401T153000Z</value>
+						<value>$now.year.0:1210T153000Z/$now.year.0:1210T163000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -123,9 +123,9 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20070401T143000Z/20070401T153000Z</value>
-						<value>20071210T153000Z/20071210T163000Z</value>
-						<value>20070402T150000Z/20070402T160000Z</value>
+						<value>$now.year.0:0401T143000Z/$now.year.0:0401T153000Z</value>
+						<value>$now.year.0:1210T153000Z/$now.year.0:1210T163000Z</value>
+						<value>$now.year.0:0402T150000Z/$now.year.0:0402T160000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -157,10 +157,10 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>20070401T143000Z/20070401T153000Z</value>
-						<value>20071210T153000Z/20071210T163000Z</value>
-						<value>20070402T150000Z/20070402T160000Z</value>
-						<value>20071211T140000Z/20071211T150000Z</value>
+						<value>$now.year.0:0401T143000Z/$now.year.0:0401T153000Z</value>
+						<value>$now.year.0:1210T153000Z/$now.year.0:1210T163000Z</value>
+						<value>$now.year.0:0402T150000Z/$now.year.0:0402T160000Z</value>
+						<value>$now.year.0:1211T140000Z/$now.year.0:1211T150000Z</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/src/__init__.py
===================================================================
--- CalDAVTester/trunk/src/__init__.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/src/__init__.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,16 +15,13 @@
 ##
 
 __all__ = [
-    "account",
     "caldavtest",
+    "httpshandler",
     "manager",
-    "monitorinfo",
-    "multithread",
-    "perfinfo",
-    "populate",
     "request",
     "serverinfo",
     "test",
     "testsuite",
     "xmlDefs",
+    "xmlUtils",
 ]

Deleted: CalDAVTester/trunk/src/monitorinfo.py
===================================================================
--- CalDAVTester/trunk/src/monitorinfo.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/src/monitorinfo.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,78 +0,0 @@
-##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-"""
-Class that encapsulates the server information for CalDAV monitoring.
-"""
-
-from src.xmlUtils import getDefaultAttributeValue
-from src.xmlUtils import getYesNoAttributeValue
-from src.xmlUtils import readOneStringElement
-from src.xmlUtils import readStringElementList
-import src.xmlDefs
-
-class monitorinfo( object ):
-    """
-    Maintains information about the monitoring test scenario.
-    """
-    def __init__( self ):
-        self.name = ""
-        self.logging = False
-        self.period = 1.0
-        self.timeout = 60
-        self.serverinfo = ""
-        self.startscript = ""
-        self.testinfo = ""
-        self.endscript = ""
-        self.warningtime = 1.0
-        self.notify = None
-        self.notify_from = None
-        self.notify_time_exceeded = False
-        self.notify_request_failed = False
-        self.notify_interval = 15
-        self.notify_subject = None
-        self.notify_body = None
-
-    def parseXML( self, node ):
-        
-        self.name = node.get(src.xmlDefs.ATTR_NAME, "")
-        for child in node.getchildren():
-            if child.tag == src.xmlDefs.ELEMENT_LOGGING:
-                self.logging = getYesNoAttributeValue(child, src.xmlDefs.ATTR_ENABLE)
-            elif child.tag == src.xmlDefs.ELEMENT_PERIOD:
-                self.period = float(child.text)
-            elif child.tag == src.xmlDefs.ELEMENT_TIMEOUT:
-                self.timeout = int(child.text)
-            elif child.tag == src.xmlDefs.ELEMENT_SERVERINFO:
-                self.serverinfo = child.text
-            elif child.tag == src.xmlDefs.ELEMENT_START:
-                if child.firstChild is not None:
-                    self.startscript = child.text
-            elif child.tag == src.xmlDefs.ELEMENT_TESTINFO:
-                self.testinfo = child.text
-            elif child.tag == src.xmlDefs.ELEMENT_END:
-                if child.firstChild is not None:
-                    self.endscript = child.text
-            elif child.tag == src.xmlDefs.ELEMENT_WARNINGTIME:
-                self.warningtime = float(child.text)
-            elif child.tag == src.xmlDefs.ELEMENT_NOTIFY:
-                self.notify_time_exceeded = getYesNoAttributeValue(child, src.xmlDefs.ATTR_TIME_EXCEEDED)
-                self.notify_request_failed = getYesNoAttributeValue(child, src.xmlDefs.ATTR_REQUEST_FAILED)
-                self.notify_interval = int(getDefaultAttributeValue(child, src.xmlDefs.ATTR_INTERVAL, "15"))
-                self.notify = readStringElementList(child, src.xmlDefs.ELEMENT_MAILTO)
-                self.notify_from = readOneStringElement(child, src.xmlDefs.ELEMENT_MAILFROM)
-                self.notify_subject = readOneStringElement(child, src.xmlDefs.ELEMENT_SUBJECT)
-                self.notify_body = readOneStringElement(child, src.xmlDefs.ELEMENT_BODY)

Deleted: CalDAVTester/trunk/src/multithread.py
===================================================================
--- CalDAVTester/trunk/src/multithread.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/src/multithread.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,95 +0,0 @@
-#!/usr/bin/env python
-#
-##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-#
-# A thread pool based function executor. This class takes a function as an argument
-# and multiple sets of arguments to the function, and it executes the function with
-# each argument set in a thread in parallel. The total number of threads is limited by
-# the thread pool and a queue is used to hold pending function executions.
-#
-# Code is copied from O'Reilly Python Cookbook Recipe 9.3.
-#
-from random import randrange
-
-import time
-import Queue
-import threading
-
-class MultiThread(object):
-
-    def __init__(self, function, argsVector, maxThreads=5, queue_results=False, sleep=0.0):
-        self._function = function
-        self._lock = threading.Lock( )
-        self._nextArgs = iter(argsVector).next
-        self._threadPool = [ threading.Thread(target=self._doSome, args=(i,))
-                             for i in range(maxThreads) ]
-        if queue_results:
-            self._queue = Queue.Queue( )
-        else:
-            self._queue = None
-            
-        self.sleep = sleep
-
-    def _doSome(self, ctr):
-        while True:
-            
-            self._lock.acquire( )
-            try:
-                try:
-                    args = self._nextArgs( )
-                except StopIteration:
-                    break
-            finally:
-                self._lock.release( )
-            # Insert user provided delay in here
-            if self.sleep != 0.0:
-                sleeper = randrange(0, 100)/100.0 * self.sleep
-                #print sleeper
-                c = time.clock()
-                #print c
-                while time.clock() - c < sleeper:
-                    time.sleep(0)    # necessary to give other threads a chance to run
-                    j = 0
-                    for i in range(100):
-                        j += i
-                #time.sleep(sleeper)
-            else:
-                sleeper = 0.0
-
-            try:
-                #print "Thread: %d, %f" % (ctr, sleeper)
-                result = self._function(args)
-                if self._queue is not None:
-                    self._queue.put((args, result))
-            except Exception, e:
-                print "Exception: %s" % e
-
-    def get(self, *a, **kw):
-        if self._queue is not None:
-            return self._queue.get(*a, **kw)
-        else:
-            raise ValueError, 'Not queueing results'
-
-    def start(self):
-        for thread in self._threadPool:
-            time.sleep(0)    # necessary to give other threads a chance to run
-            thread.start( )
-
-    def join(self, timeout=None):
-        for thread in self._threadPool:
-            thread.join(timeout)
-

Deleted: CalDAVTester/trunk/src/perfinfo.py
===================================================================
--- CalDAVTester/trunk/src/perfinfo.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/src/perfinfo.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,280 +0,0 @@
-##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-"""
-Class that encapsulates the server information for a CalDAV test run.
-"""
-
-from random import randrange
-from src.manager import manager
-from src.xmlUtils import getYesNoAttributeValue
-from threading import Timer
-from xml.etree.ElementTree import ElementTree
-from xml.parsers.expat import ExpatError
-import src.xmlDefs
-import time
-
-START_DELAY = 3.0
-
-class perfinfo( object ):
-    """
-    Maintains information about the performance test scenario.
-    """
-    def __init__( self ):
-        self.clients = 20
-        self.threads = True
-        self.logging = False
-        self.tests = []
-        self.serverinfo = ""
-        self.startscript = ""
-        self.testinfo = ""
-        self.endscript = ""
-        self.subsdict = {}
-
-    @classmethod
-    def runIt(cls, type, script, silent=False, offset=0):
-    
-        if type not in ("load ramping",):
-            raise ValueError("Performance type '%s' not supported." % (type,))
-
-        pinfo = perfinfo.parseFile(script)
-    
-        pinfo.doStart(silent)
-    
-        if type == "load ramping":
-            allresults = pinfo.doLoadRamping(offset)
-    
-        pinfo.doEnd(silent)
-        
-        return allresults
-    
-
-    @classmethod
-    def parseFile(cls, filename):
-        # Open and parse the server config file
-        try:
-            tree = ElementTree(file=filename)
-        except ExpatError, e:
-            raise RuntimeError("Unable to parse file '%s' because: %s" % (filename, e,))
-    
-        # Verify that top-level element is correct
-        perfinfo_node = tree.getroot()
-        if perfinfo_node.tag != src.xmlDefs.ELEMENT_PERFINFO:
-            raise ValueError("Invalid configuration file: %s" % (filename,))
-        if not len(perfinfo_node):
-            raise ValueError("Invalid configuration file: %s" % (filename,))
-        pinfo = perfinfo()
-        pinfo.parseXML(perfinfo_node)
-        return pinfo
-        
-    def parseXML( self, node ):
-        for child in node.getchildren():
-            if child.tag == src.xmlDefs.ELEMENT_CLIENTS:
-                self.clients = int(child.text)
-            elif child.tag == src.xmlDefs.ELEMENT_THREADS:
-                self.threads = getYesNoAttributeValue(child, src.xmlDefs.ATTR_ENABLE)
-            elif child.tag == src.xmlDefs.ELEMENT_LOGGING:
-                self.logging = getYesNoAttributeValue(child, src.xmlDefs.ATTR_ENABLE)
-            elif child.tag == src.xmlDefs.ELEMENT_TESTS:
-                self.parseTestsXML(child)
-            elif child.tag == src.xmlDefs.ELEMENT_SERVERINFO:
-                self.serverinfo = child.text
-            elif child.tag == src.xmlDefs.ELEMENT_START:
-                if child.text:
-                    self.startscript = child.text
-            elif child.tag == src.xmlDefs.ELEMENT_TESTINFO:
-                self.testinfo = child.text
-            elif child.tag == src.xmlDefs.ELEMENT_END:
-                if child.text:
-                    self.endscript = child.text
-            elif child.tag == src.xmlDefs.ELEMENT_SUBSTITUTIONS:
-                self.parseSubstitutionsXML(child)
-
-    def parseTestsXML(self, node):
-        for child in node.getchildren():
-            if child.tag == src.xmlDefs.ELEMENT_TEST:
-                clients = self.clients
-                spread = None
-                runs = None
-                for schild in child.getchildren():
-                    if schild.tag == src.xmlDefs.ELEMENT_CLIENTS:
-                        clist = schild.text.split(",")
-                        if len(clist) == 1:
-                            clients = int(clist[0])
-                        else:
-                            clients = range(int(clist[0]), int(clist[1]) + 1, int(clist[2]))
-                    elif schild.tag == src.xmlDefs.ELEMENT_SPREAD:
-                        spread = float(schild.text)
-                    elif schild.tag == src.xmlDefs.ELEMENT_RUNS:
-                        runs = int(schild.text)
-                if spread and runs:
-                    if isinstance(clients, list):
-                        for client in clients:
-                            self.tests.append((client, spread, runs,))
-                    else:
-                        self.tests.append((clients, spread, runs,))
-
-    def parseSubstitutionsXML(self, node):
-        for child in node.getchildren():
-            if child.tag == src.xmlDefs.ELEMENT_SUBSTITUTION:
-                key = None
-                value = None
-                for schild in child.getchildren():
-                    if schild.tag == src.xmlDefs.ELEMENT_KEY:
-                        key = schild.text
-                    elif schild.tag == src.xmlDefs.ELEMENT_VALUE:
-                        value = schild.text
-                if key and value:
-                    self.subsdict[key] = value
-
-    @classmethod
-    def subs(cls, str, i):
-        if "%" in str:
-            return str % i
-        else:
-            return str
-    
-    def doScript(self, script):
-        # Create argument list that varies for each threaded client. Basically use a separate
-        # server account for each client.
-        def runner(*args):
-            """
-            Test runner method. 
-            @param *args:
-            """
-            
-            if self.logging:
-                print "Start: %s" % (args[0]["moresubs"]["$userid1:"],)
-            try:
-                mgr = manager(level=manager.LOG_NONE)
-                _ignore_result, _ignore_timing = mgr.runWithOptions(*args[1:], **args[0])
-                if self.logging:
-                    print "Done: %s" % (args[0]["moresubs"]["$userid1:"],)
-            except Exception, e:
-                print "Thread run exception: %s" % (str(e),)
-    
-        args = []
-        for i in range(1, self.clients + 1):
-            moresubs = {}
-            for key, value in self.subsdict.iteritems():
-                moresubs[key] = self.subs(value, i)
-            args.append(({"moresubs": moresubs}, self.subs(self.serverinfo, i), "", [self.subs(script, i)]))
-        for arg in args:
-            runner(*arg)
-    
-    def doStart(self, silent):
-        if self.startscript:
-            if not silent:
-                print "Runnning start script %s" % (self.startscript,)
-            self.doScript(self.startscript)
-    
-    def doEnd(self, silent):
-        if self.endscript:
-            if not silent:
-                print "Runnning end script %s" % (self.endscript,)
-            self.doScript(self.endscript)
-
-    def doLoadRamping(self, offset = 0):
-        # Cummulative results
-        allresults = []
-        
-        for test in self.tests:
-            failed = [False]
-            result = [0.0, 0.0, 0.0]
-            results = []
-        
-            endtime = time.time() + START_DELAY + test[2]
-
-            def runner(*args):
-                """
-                Test runner method. 
-                @param *args:
-                """
-                
-                while(True):
-                    if self.logging:
-                        print "Start: %s" % (args[0]["moresubs"]["$userid1:"],)
-                    try:
-                        mgr = manager(level=manager.LOG_NONE)
-                        result, timing = mgr.runWithOptions(*args[1:], **args[0])
-                        if result > 0:
-                            failed[0] = True
-                        results.append((time.time(), timing))
-                        if divmod(len(results), 10)[1] == 0:
-                            print len(results)
-                        if self.logging:
-                            print "Done: %s %.3f" % (args[0]["moresubs"]["$userid1:"], timing,)
-                    except Exception, e:
-                        print "Thread run exception: %s" % (str(e),)
-                    if time.time() > endtime:
-                        break
-                    time.sleep(randrange(0, 100)/100.0 * test[1])
-        
-            # Create argument list that varies for each threaded client. Basically use a separate
-            # server account for each client.
-            args = []
-            for i in range(1 + offset, test[0] + 1 + offset):
-                moresubs = {}
-                for key, value in self.subsdict.iteritems():
-                    moresubs[key] = self.subs(value, i)
-                args.append(({"moresubs": moresubs}, self.subs(self.serverinfo, i), "", [self.subs(self.testinfo, i)]))
-        
-            if self.threads:
-                # Run threads by queuing up a set of timers set to start 5 seconds + random time
-                # after thread is actually started. The random time is spread over the interval
-                # we are testing over. Wait for all threads to finish.
-                timers = []
-                for arg in args:
-                    sleeper = START_DELAY + randrange(0, 100)/100.0 * test[1]
-                    timers.append(Timer(sleeper, runner, arg))
-            
-                for thread in timers:
-                    thread.start( )
-            
-                for thread in timers:
-                    thread.join(None)
-            else:
-                # Just execute each client request one after the other.
-                for arg in args:
-                    runner(*arg)
-    
-            # Average over 1 sec intervals
-            bins = {}
-            for timestamp, timing in results:
-                bins.setdefault(int(timestamp), []).append(timing)
-            avbins = {}
-            for key, values in bins.iteritems():
-                average = 0.0
-                for i in values:
-                    average += i
-                average /= len(values)
-                avbins[key] = (average, len(values),)
-            
-            avkeys = avbins.keys()
-            avkeys.sort()
-            rawresults = []
-            average_time = 0.0
-            average_clients = 0.0
-            for i in avkeys:
-                rawresults.append((i, avbins[i][0], avbins[i][1]))
-                average_time += avbins[i][0]
-                average_clients += avbins[i][1]
-            average_time /= len(avkeys)
-            average_clients /= len(avkeys)
-        
-            allresults.append((rawresults, test[0], average_clients, average_time,))
-    
-        return allresults

Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/src/request.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -276,9 +276,8 @@
                     data = fd.read()
                 finally:
                     fd.close()
-            if self.data.substitute:
-                data = str(self.manager.server_info.subs(data))
-                data = self.manager.server_info.extrasubs(data)
+            data = str(self.manager.server_info.subs(data))
+            data = self.manager.server_info.extrasubs(data)
             if self.data.generate:
                 if self.data.content_type.startswith("text/calendar"):
                     data = self.generateCalendarData(data)

Deleted: CalDAVTester/trunk/src/sendemail.py
===================================================================
--- CalDAVTester/trunk/src/sendemail.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/src/sendemail.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2007 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-"""
-Send an email message.
-"""
-
-from email.mime.text import MIMEText
-import smtplib
-
-def sendemail(fromaddr=("", ""), toaddrs=[], subject="", body=""):
-    """
-    
-    @param fromaddr: tuple of From address (<full name>, <email>)
-    @param toaddrs: list of tuples of (<full name>, <email>) for each recipient
-    @param subject: a C{str} containing the subject
-    @param body: a C{str} containing the body
-    """
-    
-    def fulladdr(addr):
-        if addr[0]:
-            return "%s <%s>" % (addr[0], addr[1],)
-        else:
-            return addr[1]
-
-    if isinstance(body, unicode):
-        body = body.decode("utf-8")
-    charset = "us-ascii"
-    for c in body:
-        if ord(c) > 0x7F:
-            charset = "utf-8"
-            break
-    msg = MIMEText(body, "plain", charset)
-    msg.add_header("From", fulladdr(fromaddr))
-    msg.add_header("To", ", ".join([fulladdr(a) for a in toaddrs]))
-    msg.add_header("Subject", subject)
-    msgtxt = msg.as_string(False)
-    server = smtplib.SMTP("mail.example.com")
-    server.sendmail(fromaddr[1], [a[1] for a in toaddrs], msgtxt)
-    server.quit()

Modified: CalDAVTester/trunk/src/serverinfo.py
===================================================================
--- CalDAVTester/trunk/src/serverinfo.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/src/serverinfo.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,6 +44,10 @@
             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
 
     def subs(self, str, db=None):
         if db is None:

Modified: CalDAVTester/trunk/src/xmlDefs.py
===================================================================
--- CalDAVTester/trunk/src/xmlDefs.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/src/xmlDefs.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,11 +40,9 @@
 ELEMENT_MAILFROM = "mailfrom"
 ELEMENT_MAILTO = "mailto"
 ELEMENT_METHOD = "method"
-ELEMENT_MONITORINFO = "monitorinfo"
 ELEMENT_NAME = "name"
 ELEMENT_NOTIFY = "notify"
 ELEMENT_PAUSE = "pause"
-ELEMENT_PERFINFO = "perfinfo"
 ELEMENT_PERIOD = "period"
 ELEMENT_PORT = "port"
 ELEMENT_PROPERTY = "property"

Modified: CalDAVTester/trunk/utilities/__init__.py
===================================================================
--- CalDAVTester/trunk/utilities/__init__.py	2012-06-14 22:57:07 UTC (rev 9360)
+++ CalDAVTester/trunk/utilities/__init__.py	2012-06-15 16:26:13 UTC (rev 9361)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,5 @@
 ##
 
 __all__ = [
-    "xmlutils",
     "webdav",
 ]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120615/9e76531a/attachment-0001.html>


More information about the calendarserver-changes mailing list