[CalendarServer-changes] [2466] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 23 16:39:49 PDT 2008
Revision: 2466
http://trac.macosforge.org/projects/calendarserver/changeset/2466
Author: cdaboo at apple.com
Date: 2008-05-23 16:39:48 -0700 (Fri, 23 May 2008)
Log Message:
-----------
Merged branches/users/cdaboo/timezone-service-2440 to trunk.
Modified Paths:
--------------
CalDAVTester/trunk/verifiers/prepostcondition.py
Added Paths:
-----------
CalDAVTester/trunk/Resource/timezoneservice/
CalDAVTester/trunk/Resource/timezoneservice/GB.ics
CalDAVTester/trunk/Resource/timezoneservice/London.ics
CalDAVTester/trunk/Resource/timezoneservice/New_York.ics
CalDAVTester/trunk/scripts/tests/timezoneservice.xml
Removed Paths:
-------------
CalDAVTester/trunk/Resource/timezoneservice/GB.ics
CalDAVTester/trunk/Resource/timezoneservice/London.ics
CalDAVTester/trunk/Resource/timezoneservice/New_York.ics
Copied: CalDAVTester/trunk/Resource/timezoneservice (from rev 2465, CalDAVTester/branches/users/cdaboo/timezone-service-2440/Resource/timezoneservice)
Deleted: CalDAVTester/trunk/Resource/timezoneservice/GB.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/timezone-service-2440/Resource/timezoneservice/GB.ics 2008-05-23 23:26:14 UTC (rev 2465)
+++ CalDAVTester/trunk/Resource/timezoneservice/GB.ics 2008-05-23 23:39:48 UTC (rev 2466)
@@ -1,258 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:GB
-X-LIC-LOCATION:GB
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-000115
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18471201T000000
-RDATE:18471201T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19460414T020000
-RDATE:19470316T020000
-RDATE:19480314T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19471102T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19410504T020000
-RDATE:19410504T020000
-RDATE:19450402T020000
-RDATE:19470413T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19440917T030000
-RDATE:19440917T030000
-RDATE:19450715T030000
-RDATE:19470810T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19681027T000000
-RDATE:19681027T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
Copied: CalDAVTester/trunk/Resource/timezoneservice/GB.ics (from rev 2465, CalDAVTester/branches/users/cdaboo/timezone-service-2440/Resource/timezoneservice/GB.ics)
===================================================================
--- CalDAVTester/trunk/Resource/timezoneservice/GB.ics (rev 0)
+++ CalDAVTester/trunk/Resource/timezoneservice/GB.ics 2008-05-23 23:39:48 UTC (rev 2466)
@@ -0,0 +1,258 @@
+BEGIN:VCALENDAR
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:GB
+X-LIC-LOCATION:GB
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:BDST
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:18471201T000000
+RDATE:18471201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19160521T020000
+RDATE:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19161001T030000
+RDATE:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+RDATE:19711031T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:BDST
+DTSTART:19410504T020000
+RDATE:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19440917T030000
+RDATE:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19681027T000000
+RDATE:19681027T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19960101T000000
+RDATE:19960101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
Deleted: CalDAVTester/trunk/Resource/timezoneservice/London.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/timezone-service-2440/Resource/timezoneservice/London.ics 2008-05-23 23:26:14 UTC (rev 2465)
+++ CalDAVTester/trunk/Resource/timezoneservice/London.ics 2008-05-23 23:39:48 UTC (rev 2466)
@@ -1,258 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/London
-X-LIC-LOCATION:Europe/London
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-000115
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18471201T000000
-RDATE:18471201T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19460414T020000
-RDATE:19470316T020000
-RDATE:19480314T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19471102T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19410504T020000
-RDATE:19410504T020000
-RDATE:19450402T020000
-RDATE:19470413T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19440917T030000
-RDATE:19440917T030000
-RDATE:19450715T030000
-RDATE:19470810T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19681027T000000
-RDATE:19681027T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
Copied: CalDAVTester/trunk/Resource/timezoneservice/London.ics (from rev 2465, CalDAVTester/branches/users/cdaboo/timezone-service-2440/Resource/timezoneservice/London.ics)
===================================================================
--- CalDAVTester/trunk/Resource/timezoneservice/London.ics (rev 0)
+++ CalDAVTester/trunk/Resource/timezoneservice/London.ics 2008-05-23 23:39:48 UTC (rev 2466)
@@ -0,0 +1,258 @@
+BEGIN:VCALENDAR
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Europe/London
+X-LIC-LOCATION:Europe/London
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:BDST
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:18471201T000000
+RDATE:18471201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19160521T020000
+RDATE:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19161001T030000
+RDATE:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+RDATE:19711031T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:BDST
+DTSTART:19410504T020000
+RDATE:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19440917T030000
+RDATE:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:BST
+DTSTART:19681027T000000
+RDATE:19681027T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19960101T000000
+RDATE:19960101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
Deleted: CalDAVTester/trunk/Resource/timezoneservice/New_York.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/timezone-service-2440/Resource/timezoneservice/New_York.ics 2008-05-23 23:26:14 UTC (rev 2465)
+++ CalDAVTester/trunk/Resource/timezoneservice/New_York.ics 2008-05-23 23:39:48 UTC (rev 2466)
@@ -1,131 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/New_York
-X-LIC-LOCATION:America/New_York
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19200328T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19210424T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T060000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-045602
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:18831118T120358
-RDATE:18831118T120358
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
Copied: CalDAVTester/trunk/Resource/timezoneservice/New_York.ics (from rev 2465, CalDAVTester/branches/users/cdaboo/timezone-service-2440/Resource/timezoneservice/New_York.ics)
===================================================================
--- CalDAVTester/trunk/Resource/timezoneservice/New_York.ics (rev 0)
+++ CalDAVTester/trunk/Resource/timezoneservice/New_York.ics 2008-05-23 23:39:48 UTC (rev 2466)
@@ -0,0 +1,131 @@
+BEGIN:VCALENDAR
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:America/New_York
+X-LIC-LOCATION:America/New_York
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19200328T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19210424T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T060000Z
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-045602
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:18831118T120358
+RDATE:18831118T120358
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EWT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+TZNAME:EPT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19450930T020000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR
Copied: CalDAVTester/trunk/scripts/tests/timezoneservice.xml (from rev 2465, CalDAVTester/branches/users/cdaboo/timezone-service-2440/scripts/tests/timezoneservice.xml)
===================================================================
--- CalDAVTester/trunk/scripts/tests/timezoneservice.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/timezoneservice.xml 2008-05-23 23:39:48 UTC (rev 2466)
@@ -0,0 +1,997 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ 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.
+
+ DRI: Cyrus Daboo, cdaboo at apple.com
+ -->
+
+<caldavtest>
+ <description>Test timezone service</description>
+
+ <start/>
+
+ <test-suite name='Non-query GET/POST'>
+ <test name='1'>
+ <description>GET on resource</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST on resource</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>PUT on resource - fails</description>
+ <request>
+ <method>PUT</method>
+ <ruri>/timezones</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/recurrenceput/1.txt</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>DELETE on resource - fails</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>/timezones</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Query bogus parameters'>
+ <test name='1'>
+ <description>GET on resource - invalid parameter</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?query=true</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/supported-method</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST on resource - invalid parameter</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?query=true</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/supported-method</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>GET on resource - invalid method</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=true</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/supported-method</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>POST on resource - invalid method</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=true</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/supported-method</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>GET on resource - multiple methods</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=list&method=list</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-method</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>POST on resource - multiple methods</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=list&method=list</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-method</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Query method=list'>
+ <test name='1'>
+ <description>GET on resource</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=list</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>America/New_York</value>
+ <value>America/Phoenix</value>
+ <value>GB</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST on resource</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=list</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>America/New_York</value>
+ <value>America/Phoenix</value>
+ <value>GB</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Invalid query method=get'>
+ <test name='1'>
+ <description>GET on resource - no tzid</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=get</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-timezone</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST on resource - no tzid</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=get</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-timezone</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>GET on resource - multiple tzid</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=get&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-timezone</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>POST on resource - multiple tzid</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=get&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-timezone</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>GET on resource - invalid tzid</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=get&tzid=America/Pittsburgh</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/timezone-available</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>POST on resource - invalid tzid</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=get&tzid=America/Pittsburgh</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/timezone-available</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Query method=get'>
+ <test name='1'>
+ <description>GET on resource</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=get&tzid=America/New_York</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/timezoneservice/New_York.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST on resource</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=get&tzid=America/New_York</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/timezoneservice/New_York.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>GET on resource</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=get&tzid=Europe/London</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/timezoneservice/London.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>POST on resource</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=get&tzid=Europe/London</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/timezoneservice/London.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>GET on resource</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=get&tzid=GB</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/timezoneservice/GB.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>POST on resource</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=get&tzid=GB</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/timezoneservice/GB.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Invalid query method=expand'>
+ <test name='1'>
+ <description>GET on resource - no tzid</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-timezone</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST on resource - no tzid</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-timezone</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>GET on resource - multiple tzid</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-timezone</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>POST on resource - multiple tzid</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-timezone</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>GET on resource - invalid tzid</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/Pittsburgh</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/timezone-available</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>POST on resource - invalid tzid</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/Pittsburgh</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/timezone-available</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>GET on resource - no start</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-start-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>POST on resource - no start</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-start-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>GET on resource - too many start</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&start=20090101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-start-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>POST on resource - too many start</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&start=20090101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-start-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>GET on resource - invalid start</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=2007</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-start-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <description>POST on resource - invalid start</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=2007</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-start-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
+ <description>GET on resource - no end</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='14'>
+ <description>POST on resource - no end</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='15'>
+ <description>GET on resource - too many end</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20090101&end=20090101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='16'>
+ <description>POST on resource - too many end</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20090101&end=20090101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='17'>
+ <description>GET on resource - invalid end</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=2009</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='18'>
+ <description>POST on resource - invalid end</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=2009</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='19'>
+ <description>GET on resource - start > end</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20090101&end=20080101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='20'>
+ <description>POST on resource - start > end</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20090101&end=20080101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='21'>
+ <description>GET on resource - start == end</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20080101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='22'>
+ <description>POST on resource - start == end</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20080101</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ <arg>
+ <name>error</name>
+ <value>http://calendarserver.org/ns/valid-end-date</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name="Expand">
+ <test name='1'>
+ <description>GET on resource - simple range</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20090101</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>20080101T0000</value>
+ <value>-0500</value>
+ <value>20080309T0200</value>
+ <value>-0400</value>
+ <value>20081102T0200</value>
+ <value>-0500</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST on resource - simple range</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20090101</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>20080101T0000</value>
+ <value>-0500</value>
+ <value>20080309T0200</value>
+ <value>-0400</value>
+ <value>20081102T0200</value>
+ <value>-0500</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>GET on resource - complex range</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20060101&end=20080101</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>20060101T0000</value>
+ <value>-0500</value>
+ <value>20060402T0200</value>
+ <value>-0400</value>
+ <value>20061029T0200</value>
+ <value>-0500</value>
+ <value>20070311T0200</value>
+ <value>-0400</value>
+ <value>20071104T0200</value>
+ <value>-0500</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>POST on resource - complex range</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/New_York&start=20060101&end=20080101</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>20060101T0000</value>
+ <value>-0500</value>
+ <value>20060402T0200</value>
+ <value>-0400</value>
+ <value>20061029T0200</value>
+ <value>-0500</value>
+ <value>20070311T0200</value>
+ <value>-0400</value>
+ <value>20071104T0200</value>
+ <value>-0500</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>GET on resource - no DST</description>
+ <request>
+ <method>GET</method>
+ <ruri>/timezones?method=expand&tzid=America/Phoenix&start=20060101&end=20090101</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>20060101T000000</value>
+ <value>-0700</value>
+ </arg>
+ <arg>
+ <name>notcontains</name>
+ <value>2007</value>
+ <value>2008</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>POST on resource - start == end</description>
+ <request>
+ <method>POST</method>
+ <ruri>/timezones?method=expand&tzid=America/Phoenix&start=20060101&end=20090101</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>20060101T000000</value>
+ <value>-0700</value>
+ </arg>
+ <arg>
+ <name>notcontains</name>
+ <value>2007</value>
+ <value>2008</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
Modified: CalDAVTester/trunk/verifiers/prepostcondition.py
===================================================================
--- CalDAVTester/trunk/verifiers/prepostcondition.py 2008-05-23 23:26:14 UTC (rev 2465)
+++ CalDAVTester/trunk/verifiers/prepostcondition.py 2008-05-23 23:39:48 UTC (rev 2466)
@@ -26,11 +26,12 @@
class Verifier(object):
def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
- # If no status veriffication requested, then assume all 2xx codes are OK
+ # If no status verification requested, then assume all 2xx codes are OK
teststatus = args.get("error", [])
+ statusCode = args.get("status", ["403", "409", "507"])
- # status code must be 403 or 409 as per rfc3253 section 1.6, or 507 as per rfc4331 section 6
- if response.status not in [403, 409, 507]:
+ # status code could be anything, but typically 403, 409 or 507
+ if str(response.status) not in statusCode:
return False, " HTTP Status Code Wrong: %d" % (response.status,)
# look for pre-condition data
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080523/82ead11a/attachment-0001.htm
More information about the calendarserver-changes
mailing list