[CalendarServer-changes] [7207] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Mar 17 11:53:28 PDT 2011
Revision: 7207
http://trac.macosforge.org/projects/calendarserver/changeset/7207
Author: cdaboo at apple.com
Date: 2011-03-17 11:53:26 -0700 (Thu, 17 Mar 2011)
Log Message:
-----------
Merge of pycalendar branch.
Modified Paths:
--------------
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/implicit/dropbox/simple/10.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/6.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/9.ics
CalDAVTester/trunk/Resource/CalDAV/reports/put/103.txt
CalDAVTester/trunk/Resource/CalDAV/timezoneservice/New_York.ics
CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml
CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml
CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml
CalDAVTester/trunk/scripts/tests/CardDAV/get.xml
CalDAVTester/trunk/scripts/tests/CardDAV/put.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
CalDAVTester/trunk/verifiers/calendarDataMatch.py
CalDAVTester/trunk/verifiers/freeBusy.py
CalDAVTester/trunk/verifiers/postFreeBusy.py
Added Paths:
-----------
CalDAVTester/trunk/verifiers/addressDataMatch.py
Property Changed:
----------------
CalDAVTester/trunk/
CalDAVTester/trunk/Resource/CalDAV/errors/1.xml
CalDAVTester/trunk/Resource/CalDAV/errors/10.xml
CalDAVTester/trunk/Resource/CalDAV/errors/11.xml
CalDAVTester/trunk/Resource/CalDAV/errors/12.xml
CalDAVTester/trunk/Resource/CalDAV/errors/13.xml
CalDAVTester/trunk/Resource/CalDAV/errors/14.xml
CalDAVTester/trunk/Resource/CalDAV/errors/15.xml
CalDAVTester/trunk/Resource/CalDAV/errors/16.xml
CalDAVTester/trunk/Resource/CalDAV/errors/17.xml
CalDAVTester/trunk/Resource/CalDAV/errors/18.xml
CalDAVTester/trunk/Resource/CalDAV/errors/19.xml
CalDAVTester/trunk/Resource/CalDAV/errors/2.ics
CalDAVTester/trunk/Resource/CalDAV/errors/20.xml
CalDAVTester/trunk/Resource/CalDAV/errors/21.xml
CalDAVTester/trunk/Resource/CalDAV/errors/22.xml
CalDAVTester/trunk/Resource/CalDAV/errors/23.xml
CalDAVTester/trunk/Resource/CalDAV/errors/24.xml
CalDAVTester/trunk/Resource/CalDAV/errors/25.xml
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/29.xml
CalDAVTester/trunk/Resource/CalDAV/errors/3.ics
CalDAVTester/trunk/Resource/CalDAV/errors/30.xml
CalDAVTester/trunk/Resource/CalDAV/errors/31.xml
CalDAVTester/trunk/Resource/CalDAV/errors/32.xml
CalDAVTester/trunk/Resource/CalDAV/errors/4.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/implicit/schedulechanges/organizerchange/1.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml
CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml
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/scripts/tests/CalDAV/implicitoptions.xml
Property changes on: CalDAVTester/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/1.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/1.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/1.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/1.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/1.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/1.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/1.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/1.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/1.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/1.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/1.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/1.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/1.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/10.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/10.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/10.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/10.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/10.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/10.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/10.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/10.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/10.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/10.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/10.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/10.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/10.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/11.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/11.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/11.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/11.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/11.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/11.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/11.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/11.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/11.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/11.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/11.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/11.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/11.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/12.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/12.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/12.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/12.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/12.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/12.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/12.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/12.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/12.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/12.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/12.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/12.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/12.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/13.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/13.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/13.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/13.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/13.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/13.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/13.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/13.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/13.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/13.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/13.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/13.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/13.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/14.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/14.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/14.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/14.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/14.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/14.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/14.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/14.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/14.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/14.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/14.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/14.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/14.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/15.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/15.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/15.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/15.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/15.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/15.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/15.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/15.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/15.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/15.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/15.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/15.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/15.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/16.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/16.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/16.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/16.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/16.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/16.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/16.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/16.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/16.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/16.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/16.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/16.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/16.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/17.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/17.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/17.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/17.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/17.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/17.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/17.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/17.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/17.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/17.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/17.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/17.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/17.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/18.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/18.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/18.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/18.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/18.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/18.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/18.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/18.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/18.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/18.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/18.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/18.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/18.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/19.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/19.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/19.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/19.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/19.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/19.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/19.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/19.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/19.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/19.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/19.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/19.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/19.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/2.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/2.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/2.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/2.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/2.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/2.ics:5229-5440
/CalDAVTester/trunk/Resource/errors/2.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/2.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/2.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/2.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/2.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/2.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/2.ics:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/20.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/20.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/20.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/20.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/20.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/20.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/20.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/20.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/20.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/20.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/20.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/20.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/20.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/21.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/21.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/21.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/21.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/21.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/21.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/21.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/21.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/21.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/21.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/21.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/21.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/21.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/22.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/22.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/22.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/22.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/22.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/22.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/22.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/22.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/22.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/22.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/22.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/22.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/22.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/23.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/23.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/23.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/23.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/23.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/23.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/23.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/23.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/23.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/23.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/23.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/23.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/23.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/24.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/24.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/24.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/24.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/24.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/24.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/24.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/24.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/24.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/24.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/24.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/24.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/24.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/25.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/25.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/25.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/25.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/25.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/25.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/25.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/25.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/25.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/25.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/25.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/25.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/25.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/26.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/26.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/26.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/26.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/26.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/26.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/26.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/26.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/26.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/26.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/26.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/26.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/26.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/27.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/27.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/27.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/27.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/27.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/27.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/27.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/27.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/27.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/27.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/27.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/27.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/27.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/28.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/28.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/28.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/28.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/28.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/28.ics:5229-5440
/CalDAVTester/trunk/Resource/errors/28.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/28.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/28.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/28.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/28.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/28.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/28.ics:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/29.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/29.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/29.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/29.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/29.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/29.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/29.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/29.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/29.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/29.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/29.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/29.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/29.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/3.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/3.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/3.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/3.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/3.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/3.ics:5229-5440
/CalDAVTester/trunk/Resource/errors/3.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/3.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/3.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/3.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/3.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/3.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/3.ics:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/30.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/30.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/30.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/30.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/30.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/30.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/30.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/30.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/30.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/30.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/30.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/30.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/30.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/31.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/31.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/31.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/31.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/31.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/31.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/31.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/31.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/31.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/31.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/31.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/31.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/31.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/32.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/32.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/32.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/32.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/32.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/32.xml:5229-5440
/CalDAVTester/trunk/Resource/errors/32.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/32.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/32.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/32.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/32.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/32.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/32.xml:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/4.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/4.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/4.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/4.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/4.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/4.ics:5229-5440
/CalDAVTester/trunk/Resource/errors/4.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/4.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/4.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/4.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/4.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/4.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/4.ics:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/5.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/5.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/5.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/5.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/5.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/5.ics:5229-5440
/CalDAVTester/trunk/Resource/errors/5.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/5.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/5.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/5.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/5.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/5.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/5.ics:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/6.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/6.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/6.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/6.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/6.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/6.ics:5229-5440
/CalDAVTester/trunk/Resource/errors/6.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/6.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/6.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/6.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/6.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/6.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/6.ics:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/7.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/7.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/7.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/7.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/7.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/7.ics:5229-5440
/CalDAVTester/trunk/Resource/errors/7.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/7.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/7.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/7.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/7.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/7.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/7.ics:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/8.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/8.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/8.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/8.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/8.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/8.ics:5229-5440
/CalDAVTester/trunk/Resource/errors/8.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/8.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/8.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/8.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/8.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/8.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/8.ics:5229-5440
Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/9.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/9.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/9.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/9.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/9.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/9.ics:5229-5440
/CalDAVTester/trunk/Resource/errors/9.txt:3142
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/9.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/9.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/9.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/9.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/9.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/9.ics:5229-5440
Modified: CalDAVTester/trunk/Resource/CalDAV/floating/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/1.txt 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/1.txt 2011-03-17 18:53:26 UTC (rev 7207)
@@ -11,8 +11,7 @@
</C:comp-filter>
</C:comp-filter>
</C:filter>
-<C:timezone>
-BEGIN:VCALENDAR
+<C:timezone>BEGIN:VCALENDAR
CALSCALE:GREGORIAN
PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
Modified: CalDAVTester/trunk/Resource/CalDAV/floating/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/2.txt 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/2.txt 2011-03-17 18:53:26 UTC (rev 7207)
@@ -11,8 +11,7 @@
</C:comp-filter>
</C:comp-filter>
</C:filter>
-<C:timezone>
-BEGIN:VCALENDAR
+<C:timezone>BEGIN:VCALENDAR
CALSCALE:GREGORIAN
PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
Modified: CalDAVTester/trunk/Resource/CalDAV/floating/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/3.txt 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/3.txt 2011-03-17 18:53:26 UTC (rev 7207)
@@ -11,8 +11,7 @@
</C:comp-filter>
</C:comp-filter>
</C:filter>
-<C:timezone>
-BEGIN:VCALENDAR
+<C:timezone>BEGIN:VCALENDAR
CALSCALE:GREGORIAN
PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/10.ics 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/10.ics 2011-03-17 18:53:26 UTC (rev 7207)
@@ -30,9 +30,9 @@
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 1
-ATTACH;VALUE=URI:$host:$dropboxpath1:/
+ATTACH:$host:$dropboxpath1:/
6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist
-ATTACH;VALUE=URI:$host:$dropboxpath1:/
+ATTACH:$host:$dropboxpath1:/
6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd-2.plist
X-APPLE-DROPBOX:$dropboxpath1:/6073432E-644B-4965-B6F7
-C3F08E70BBF9.dropbox
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/12.ics 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/12.ics 2011-03-17 18:53:26 UTC (rev 7207)
@@ -30,7 +30,7 @@
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 1
-ATTACH;VALUE=URI:$host:$dropboxpath1:/
+ATTACH:$host:$dropboxpath1:/
6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd-2.plist
X-APPLE-DROPBOX:$dropboxpath1:/6073432E-644B-4965-B6F7
-C3F08E70BBF9.dropbox
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/2.ics 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/2.ics 2011-03-17 18:53:26 UTC (rev 7207)
@@ -30,7 +30,7 @@
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 1
-ATTACH;VALUE=URI:$host:$dropboxpath1:/
+ATTACH:$host:$dropboxpath1:/
6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist
X-APPLE-DROPBOX:$dropboxpath1:/6073432E-644B-4965-B6F7
-C3F08E70BBF9.dropbox
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/4.ics 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/4.ics 2011-03-17 18:53:26 UTC (rev 7207)
@@ -32,7 +32,7 @@
SUMMARY:event 1
TRANSP:TRANSPARENT
X-APPLE-NEEDS-REPLY:TRUE
-ATTACH;VALUE=URI:$host:$dropboxpath1:/
+ATTACH:$host:$dropboxpath1:/
6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist
X-APPLE-DROPBOX:$dropboxpath1:/6073432E-644B-4965-B6F7
-C3F08E70BBF9.dropbox
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/6.ics 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/6.ics 2011-03-17 18:53:26 UTC (rev 7207)
@@ -30,7 +30,7 @@
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 1
-ATTACH;VALUE=URI:$host:$dropboxpath1:/
+ATTACH:$host:$dropboxpath1:/
6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist
X-APPLE-DROPBOX:$dropboxpath1:/6073432E-644B-4965-B6F7
-C3F08E70BBF9.dropbox
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/9.ics 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/dropbox/simple/9.ics 2011-03-17 18:53:26 UTC (rev 7207)
@@ -30,9 +30,9 @@
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 1
-ATTACH;VALUE=URI:$host:$dropboxpath1:/
+ATTACH:$host:$dropboxpath1:/
6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist
-ATTACH;VALUE=URI:$host:$dropboxpath1:/
+ATTACH:$host:$dropboxpath1:/
6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd-2.plist
X-APPLE-DROPBOX:$dropboxpath1:/6073432E-644B-4965-B6F7
-C3F08E70BBF9.dropbox
Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/1.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/1.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/1.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/1.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/1.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/1.ics:2451,3035,3142,3165,3190,3405,3432
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/1.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/1.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/1.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/1.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/1.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/1.ics:2451,3035,3142,3165,3190,3405,3432
Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/2.xml:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/2.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/2.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/2.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/2.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/2.xml:2451,3035,3142,3165,3190,3405,3432
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/2.xml:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/2.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/2.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/2.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/2.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/2.xml:2451,3035,3142,3165,3190,3405,3432
Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/3.xml:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/3.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/3.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/3.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/3.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/3.xml:2451,3035,3142,3165,3190,3405,3432
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/3.xml:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/3.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/3.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/3.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/3.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/3.xml:2451,3035,3142,3165,3190,3405,3432
Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/4.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/4.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/4.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/4.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/4.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/4.ics:2451,3035,3142,3165,3190,3405,3432
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/4.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/4.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/4.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/4.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/4.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/4.ics:2451,3035,3142,3165,3190,3405,3432
Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/5.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/5.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/5.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/5.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/5.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/5.ics:2451,3035,3142,3165,3190,3405,3432
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/5.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/5.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/5.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/5.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/5.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/5.ics:2451,3035,3142,3165,3190,3405,3432
Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/6.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/6.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/6.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/6.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/6.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/6.ics:2451,3035,3142,3165,3190,3405,3432
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/6.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/6.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/6.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/6.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/6.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/6.ics:2451,3035,3142,3165,3190,3405,3432
Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/7.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/7.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/7.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/7.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/7.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/7.ics:2451,3035,3142,3165,3190,3405,3432
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/7.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/7.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/7.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/7.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/7.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/7.ics:2451,3035,3142,3165,3190,3405,3432
Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/8.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/8.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/8.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/8.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/8.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/8.ics:2451,3035,3142,3165,3190,3405,3432
+ /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/8.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/8.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/8.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/8.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/8.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/8.ics:2451,3035,3142,3165,3190,3405,3432
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/103.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/103.txt 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/103.txt 2011-03-17 18:53:26 UTC (rev 7207)
@@ -23,7 +23,7 @@
BEGIN:VTODO
DTSTAMP:20060313T151542Z
DTSTART;TZID=US/Pacific:20060101T130000
-DURATION:P1H
+DURATION:PT1H
STATUS:NEEDS-ACTION
SUMMARY:TASK 3
UID:task03 at example.local
Modified: CalDAVTester/trunk/Resource/CalDAV/timezoneservice/New_York.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/timezoneservice/New_York.ics 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/Resource/CalDAV/timezoneservice/New_York.ics 2011-03-17 18:53:26 UTC (rev 7207)
@@ -1,131 +1,148 @@
BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
VERSION:2.0
BEGIN:VTIMEZONE
TZID:America/New_York
X-LIC-LOCATION:America/New_York
+BEGIN:STANDARD
+DTSTART:18831118T120358
+RDATE:18831118T120358
+TZNAME:EST
+TZOFFSETFROM:-045602
+TZOFFSETTO:-0500
+END:STANDARD
BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T070000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EDT
TZOFFSETFROM:-0500
TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19200328T070000Z
END:DAYLIGHT
BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
TZOFFSETFROM:-0400
TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
TZNAME:EST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T060000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
END:STANDARD
BEGIN:DAYLIGHT
+DTSTART:19200328T020000
+RDATE:19200328T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:EDT
TZOFFSETFROM:-0500
TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19210424T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T070000Z
END:DAYLIGHT
BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19450930T020000
+TZNAME:EST
TZOFFSETFROM:-0400
TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T060000Z
END:STANDARD
BEGIN:DAYLIGHT
+DTSTART:19210424T020000
+RRULE:FREQ=YEARLY;UNTIL=19410427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
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
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;UNTIL=19410928T060000Z;BYDAY=-1SU;BYMONTH=9
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
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:EWT
TZOFFSETFROM:-0500
TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
END:DAYLIGHT
BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
END:DAYLIGHT
BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
TZOFFSETFROM:-0500
TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
END:DAYLIGHT
BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
TZOFFSETFROM:-0400
TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
END:STANDARD
BEGIN:STANDARD
-TZOFFSETFROM:-045602
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:18831118T120358
-RDATE:18831118T120358
END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
END:STANDARD
BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
TZOFFSETFROM:-0500
TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
END:DAYLIGHT
BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
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
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml 2011-03-17 18:53:26 UTC (rev 7207)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2011 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.
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2011-03-17 18:53:26 UTC (rev 7207)
@@ -361,7 +361,7 @@
</verify>
</request>
</test>
- <test name='12'>
+ <test name='12' ignore='yes'> <!-- PyCalendar merges similar components for now -->
<description>PUT duplicate RECURRENCE-ID</description>
<request end-delete="yes" print-response='no'>
<method>PUT</method>
Property changes on: CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/implicitoptions.xml:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/implicitoptions.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitoptions.xml:5229-5440
+ /CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/implicitoptions.xml:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/implicitoptions.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/implicitoptions.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitoptions.xml:5229-5440
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml 2011-03-17 18:53:26 UTC (rev 7207)
@@ -981,7 +981,7 @@
</test>
</test-suite>
- <test-suite name='Alarms' ignore='yes'>
+ <test-suite name='Alarms' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -1469,7 +1469,7 @@
</test>
</test-suite>
- <test-suite name='Recurring Alarms' ignore='yes'>
+ <test-suite name='Recurring Alarms' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -1746,7 +1746,7 @@
</test>
</test-suite>
- <test-suite name='No X- properties' ignore='yes'>
+ <test-suite name='No X- properties' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -1985,7 +1985,7 @@
</test>
</test-suite>
- <test-suite name='TZID reset' ignore='yes'>
+ <test-suite name='TZID reset' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -2174,7 +2174,7 @@
</test>
</test-suite>
- <test-suite name='No master Organizer' ignore='yes'>
+ <test-suite name='No master Organizer' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -2440,7 +2440,7 @@
</test>
</test-suite>
- <test-suite name='Duplicate Attendee' ignore='yes'>
+ <test-suite name='Duplicate Attendee' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml 2011-03-17 18:53:26 UTC (rev 7207)
@@ -110,7 +110,7 @@
<method>GET</method>
<ruri>$posted:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/1.vcf</value>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml 2011-03-17 18:53:26 UTC (rev 7207)
@@ -3,7 +3,7 @@
<!DOCTYPE CardDAVtest SYSTEM "CardDAVtest.dtd">
<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2011 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.
@@ -115,7 +115,7 @@
<method>GET</method>
<ruri>$href:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/simple/1.vcf</value>
@@ -155,7 +155,7 @@
<method>GET</method>
<ruri>$href:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/simple/1.vcf</value>
@@ -207,7 +207,7 @@
<method>GET</method>
<ruri>$href2:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/simple/3.vcf</value>
@@ -275,7 +275,7 @@
<method>GET</method>
<ruri>$href1:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/simple/5.vcf</value>
@@ -296,7 +296,7 @@
<method>GET</method>
<ruri>$href2:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/simple/6.vcf</value>
@@ -351,7 +351,7 @@
<method>GET</method>
<ruri>$href1:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/simple/5.vcf</value>
@@ -372,7 +372,7 @@
<method>GET</method>
<ruri>$href3:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/simple/8.vcf</value>
@@ -440,7 +440,7 @@
<method>GET</method>
<ruri>$href:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/simple/10.vcf</value>
@@ -619,7 +619,7 @@
<method>GET</method>
<ruri>$href:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-one/2.vcf</value>
@@ -659,7 +659,7 @@
<method>GET</method>
<ruri>$href:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-one/2.vcf</value>
@@ -711,7 +711,7 @@
<method>GET</method>
<ruri>$href2:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-one/5.vcf</value>
@@ -776,7 +776,7 @@
<method>GET</method>
<ruri>$href1:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-multiple/2.vcf</value>
@@ -830,7 +830,7 @@
<method>GET</method>
<ruri>$href1:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-multiple/4.vcf</value>
@@ -851,7 +851,7 @@
<method>GET</method>
<ruri>$href2:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-multiple/5.vcf</value>
@@ -903,7 +903,7 @@
<method>GET</method>
<ruri>$href1:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-multiple/7.vcf</value>
@@ -985,7 +985,7 @@
<method>GET</method>
<ruri>$href1:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-ifmatch/2.vcf</value>
@@ -1006,7 +1006,7 @@
<method>GET</method>
<ruri>$href2:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-ifmatch/3.vcf</value>
@@ -1061,7 +1061,7 @@
<method>GET</method>
<ruri>$href1:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-ifmatch/2.vcf</value>
@@ -1082,7 +1082,7 @@
<method>GET</method>
<ruri>$href2:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-ifmatch/3.vcf</value>
@@ -1103,7 +1103,7 @@
<method>GET</method>
<ruri>$href3:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-ifmatch/5.vcf</value>
@@ -1169,7 +1169,7 @@
<method>GET</method>
<ruri>$href2:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-ifmatch/7.vcf</value>
@@ -1190,7 +1190,7 @@
<method>GET</method>
<ruri>$href3:</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/bulk/crud-ifmatch/5.vcf</value>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/get.xml 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/get.xml 2011-03-17 18:53:26 UTC (rev 7207)
@@ -48,7 +48,7 @@
<callback>statusCode</callback>
</verify>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/1.vcf</value>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/put.xml 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/put.xml 2011-03-17 18:53:26 UTC (rev 7207)
@@ -52,7 +52,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/1.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/1.vcf</value>
@@ -84,7 +84,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/2.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/2.vcf</value>
@@ -116,7 +116,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/3.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/3.vcf</value>
@@ -148,7 +148,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/4.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/4.vcf</value>
@@ -180,7 +180,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/5.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/5.vcf</value>
@@ -212,7 +212,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/6.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/6.vcf</value>
@@ -244,7 +244,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/7.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/7.vcf</value>
@@ -276,7 +276,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/8.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/8.vcf</value>
@@ -308,7 +308,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/9.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/9.vcf</value>
@@ -340,7 +340,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/10.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/10.vcf</value>
@@ -375,7 +375,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/11.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/11.vcf</value>
@@ -407,7 +407,7 @@
<method>GET</method>
<ruri>$addressbookpath1:/12.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/vcardput/12.vcf</value>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2011-03-17 18:53:26 UTC (rev 7207)
@@ -160,7 +160,7 @@
<method>GET</method>
<ruri>$addressbookhome1:/shared/1.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/sharing/addressbooks/read-write/5.vcf</value>
@@ -188,7 +188,7 @@
<method>GET</method>
<ruri>$sharedaddressbook:/1.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/sharing/addressbooks/read-write/6.vcf</value>
@@ -216,7 +216,7 @@
<method>GET</method>
<ruri>$sharedaddressbook:/2.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/sharing/addressbooks/read-write/7.vcf</value>
@@ -244,7 +244,7 @@
<method>GET</method>
<ruri>$addressbookhome1:/shared/2.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/sharing/addressbooks/read-write/8.vcf</value>
@@ -384,7 +384,7 @@
<method>GET</method>
<ruri>$sharedaddressbook:/4.vcf</ruri>
<verify>
- <callback>calendarDataMatch</callback>
+ <callback>addressDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CardDAV/sharing/addressbooks/read-only/6.vcf</value>
Copied: CalDAVTester/trunk/verifiers/addressDataMatch.py (from rev 7206, CalDAVTester/branches/users/cdaboo/pycalendar/verifiers/addressDataMatch.py)
===================================================================
--- CalDAVTester/trunk/verifiers/addressDataMatch.py (rev 0)
+++ CalDAVTester/trunk/verifiers/addressDataMatch.py 2011-03-17 18:53:26 UTC (rev 7207)
@@ -0,0 +1,111 @@
+##
+# Copyright (c) 2006-2009 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 vobject.base import readOne, ContentLine
+from vobject.base import Component
+from difflib import unified_diff
+import StringIO
+
+"""
+Verifier that checks the response body for an exact match to data in a file.
+"""
+
+class Verifier(object):
+
+ def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
+ # Get arguments
+ files = args.get("filepath", [])
+ filters = args.get("filter", [])
+
+ if "EMAIL parameter" not in manager.server_info.features:
+ filters.append("ATTENDEE:EMAIL")
+ filters.append("ORGANIZER:EMAIL")
+ filters.append("CALSCALE")
+ filters.append("PRODID")
+ filters.append("CREATED")
+ filters.append("LAST-MODIFIED")
+
+ # status code must be 200, 207
+ if response.status not in (200,207):
+ return False, " HTTP Status Code Wrong: %d" % (response.status,)
+
+ # look for response data
+ if not respdata:
+ return False, " No response body"
+
+ # look for one file
+ if len(files) != 1:
+ return False, " No file to compare response to"
+
+ # read in all data from specified file
+ fd = open( files[0], "r" )
+ try:
+ try:
+ data = fd.read()
+ finally:
+ fd.close()
+ except:
+ data = None
+
+ if data is None:
+ return False, " Could not read data file"
+
+ data = manager.server_info.subs(data)
+
+ def removePropertiesParameters(component):
+
+ for item in tuple(component.getChildren()):
+ if isinstance(item, Component):
+ removePropertiesParameters(item)
+ elif isinstance(item, ContentLine):
+
+ # Always remove DTSTAMP
+ if item.name == "DTSTAMP":
+ component.remove(item)
+ elif item.name == "X-CALENDARSERVER-ATTENDEE-COMMENT":
+ if item.params.has_key("X-CALENDARSERVER-DTSTAMP"):
+ item.params["X-CALENDARSERVER-DTSTAMP"] = ["20080101T000000Z"]
+
+ for filter in filters:
+ if ":" in filter:
+ property, parameter = filter.split(":")
+ if item.name == property:
+ if item.params.has_key(parameter):
+ del item.params[parameter]
+ else:
+ if item.name == filter:
+ component.remove(item)
+
+ s = StringIO.StringIO(respdata)
+ try:
+ resp_calendar = readOne(s)
+ removePropertiesParameters(resp_calendar)
+ respdata = resp_calendar.serialize()
+
+ s = StringIO.StringIO(data)
+ data_calendar = readOne(s)
+ removePropertiesParameters(data_calendar)
+ data = data_calendar.serialize()
+
+ result = respdata == data
+
+ if result:
+ return True, ""
+ else:
+ error_diff = "\n".join([line for line in unified_diff(data.split("\n"), respdata.split("\n"))])
+ return False, " Response data does not exactly match file data%s" % (error_diff,)
+ except Exception, e:
+ return False, " Response data is not calendar data data: %s" % (e,)
Modified: CalDAVTester/trunk/verifiers/calendarDataMatch.py
===================================================================
--- CalDAVTester/trunk/verifiers/calendarDataMatch.py 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/verifiers/calendarDataMatch.py 2011-03-17 18:53:26 UTC (rev 7207)
@@ -14,11 +14,9 @@
# limitations under the License.
##
-from vobject.base import readOne, ContentLine
-from vobject.base import Component
from difflib import unified_diff
-import StringIO
-from vobject.icalendar import RecurringComponent, TimezoneComponent
+from pycalendar.calendar import PyCalendar
+from pycalendar.attribute import PyCalendarAttribute
"""
Verifier that checks the response body for an exact match to data in a file.
@@ -72,74 +70,40 @@
def removePropertiesParameters(component):
- for item in tuple(component.getChildren()):
- if isinstance(item, Component):
- removePropertiesParameters(item)
- elif isinstance(item, ContentLine):
-
- # Always remove DTSTAMP
- if item.name == "DTSTAMP":
- component.remove(item)
- elif item.name == "X-CALENDARSERVER-ATTENDEE-COMMENT":
- if item.params.has_key("X-CALENDARSERVER-DTSTAMP"):
- item.params["X-CALENDARSERVER-DTSTAMP"] = ["20080101T000000Z"]
-
- for filter in filters:
- if ":" in filter:
- property, parameter = filter.split(":")
- if item.name == property:
- if item.params.has_key(parameter):
- del item.params[parameter]
- else:
- if item.name == filter:
- component.remove(item)
+ for subcomponent in component.getComponents():
+ removePropertiesParameters(subcomponent)
- def normalizeRRULE(calobj):
-
- for component in calobj.getChildren():
- if isinstance(component, RecurringComponent):
- rruleset = component.rruleset
- if rruleset:
- component.rruleset = rruleset
- elif isinstance(component, TimezoneComponent):
- tzinfo = component.tzinfo
- if tzinfo:
- component.tzinfo = tzinfo
+ allProps = []
+ for properties in component.getProperties().itervalues():
+ allProps.extend(properties)
+ for property in allProps:
+ # Always remove DTSTAMP
+ if property.getName() == "DTSTAMP":
+ component.removeProperty(property)
+ elif property.getName() == "PRODID":
+ component.removeProperty(property)
+ elif property.getName() == "X-CALENDARSERVER-ATTENDEE-COMMENT":
+ if property.hasAttribute("X-CALENDARSERVER-DTSTAMP"):
+ property.replaceAttribute(PyCalendarAttribute("X-CALENDARSERVER-DTSTAMP", "20080101T000000Z"))
+
+ for filter in filters:
+ if ":" in filter:
+ propname, parameter = filter.split(":")
+ if property.getName() == propname:
+ if property.hasAttribute(parameter):
+ property.removeAttributes(parameter)
+ else:
+ if property.getName() == filter:
+ component.removeProperty(property)
- def sortComponents(calobj):
- for compType in ('vevent', 'vtodo', 'vjournal', 'vavailability'):
- try:
- comps = calobj.contents[compType]
-
- def _key(comp):
- try:
- uid = comp.contents['uid'][0].valueRepr()
- except KeyError:
- uid = ""
- try:
- rid = comp.contents['recurrence-id'][0].valueRepr()
- except KeyError:
- rid = ""
- return uid + ":" + rid
-
- comps.sort(key=_key)
- except KeyError:
- pass
-
- s = StringIO.StringIO(respdata)
try:
- resp_calendar = readOne(s)
+ resp_calendar = PyCalendar.parseText(respdata)
removePropertiesParameters(resp_calendar)
- normalizeRRULE(resp_calendar)
- sortComponents(resp_calendar)
- respdata = resp_calendar.serialize()
+ respdata = resp_calendar.getText()
- s = StringIO.StringIO(data)
- data_calendar = readOne(s)
+ data_calendar = PyCalendar.parseText(data)
removePropertiesParameters(data_calendar)
- normalizeRRULE(data_calendar)
- sortComponents(data_calendar)
- data = data_calendar.serialize()
+ data = data_calendar.getText()
result = respdata == data
Modified: CalDAVTester/trunk/verifiers/freeBusy.py
===================================================================
--- CalDAVTester/trunk/verifiers/freeBusy.py 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/verifiers/freeBusy.py 2011-03-17 18:53:26 UTC (rev 7207)
@@ -17,12 +17,10 @@
"""
Verifier that checks the response of a free-busy-query.
"""
-import StringIO
-from vobject.icalendar import periodToString
-import datetime
-from vobject.base import VObjectError
-from vobject.base import readOne
+from pycalendar.calendar import PyCalendar
+from pycalendar.exceptions import PyCalendarInvalidData
+
class Verifier(object):
def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
@@ -38,37 +36,33 @@
# Parse data as calendar object
try:
- s = StringIO.StringIO(respdata)
- calendar = readOne(s)
+ calendar = PyCalendar.parseText(respdata)
# Check for calendar
- if calendar.name != "VCALENDAR":
- raise ValueError("Top-level component is not a calendar: %s" % (calendar.name, ))
+ if calendar is None:
+ raise ValueError("Not a calendar: %s" % (respdata, ))
# Only one component
- comps = list(calendar.components())
+ comps = calendar.getComponents("VFREEBUSY")
if len(comps) != 1:
- raise ValueError("Wrong number of components in calendar")
+ raise ValueError("Wrong number or unexpected components in calendar")
# Must be VFREEBUSY
fb = comps[0]
- if fb.name != "VFREEBUSY":
- raise ValueError("Calendar contains unexpected component: %s" % (fb.name, ))
# Extract periods
busyp = []
tentativep = []
unavailablep = []
- for fp in [x for x in fb.lines() if x.name == "FREEBUSY"]:
- periods = fp.value
+ for fp in fb.getProperties("FREEBUSY"):
+ periods = fp.getValue().getValues()
# Convert start/duration to start/end
for i in range(len(periods)):
- if isinstance(periods[i][1], datetime.timedelta):
- periods[i] = (periods[i][0], periods[i][0] + periods[i][1])
+ periods[i].getValue().setUseDuration(False)
# Check param
fbtype = "BUSY"
- if "FBTYPE" in fp.params:
- fbtype = fp.params["FBTYPE"][0]
+ if fp.hasAttribute("FBTYPE"):
+ fbtype = fp.getAttributeValue("FBTYPE")
if fbtype == "BUSY":
busyp.extend(periods)
elif fbtype == "BUSY-TENTATIVE":
@@ -86,13 +80,13 @@
# Convert to string sets
busy = set(busy)
- busyp[:] = [periodToString(x) for x in busyp]
+ busyp = [x.getValue().getText() for x in busyp]
busyp = set(busyp)
tentative = set(tentative)
- tentativep[:] = [periodToString(x) for x in tentativep]
+ tentativep = [x.getValue().getText() for x in tentativep]
tentativep = set(tentativep)
unavailable = set(unavailable)
- unavailablep[:] = [periodToString(x) for x in unavailablep]
+ unavailablep = [x.getValue().getText() for x in unavailablep]
unavailablep = set(unavailablep)
# Compare all periods
@@ -103,7 +97,7 @@
elif len(unavailablep.symmetric_difference(unavailable)):
raise ValueError("Busy-unavailable periods do not match")
- except VObjectError:
+ except PyCalendarInvalidData:
return False, " HTTP response data is not a calendar"
except ValueError, txt:
return False, " HTTP response data is invalid: %s" % (txt,)
Modified: CalDAVTester/trunk/verifiers/postFreeBusy.py
===================================================================
--- CalDAVTester/trunk/verifiers/postFreeBusy.py 2011-03-17 17:54:34 UTC (rev 7206)
+++ CalDAVTester/trunk/verifiers/postFreeBusy.py 2011-03-17 18:53:26 UTC (rev 7207)
@@ -18,13 +18,11 @@
Verifier that checks the response of a free-busy-query.
"""
-from vobject.base import VObjectError
-from vobject.base import readOne
-from vobject.icalendar import periodToString
-import StringIO
-import datetime
+from pycalendar.calendar import PyCalendar
+from pycalendar.exceptions import PyCalendarInvalidData
from xml.etree.ElementTree import ElementTree
from xml.parsers.expat import ExpatError
+import StringIO
class Verifier(object):
@@ -49,26 +47,23 @@
for calendar in tree.findall("/{urn:ietf:params:xml:ns:caldav}response/{urn:ietf:params:xml:ns:caldav}calendar-data"):
# Parse data as calendar object
try:
- s = StringIO.StringIO(calendar.text)
- calendar = readOne(s)
+ calendar = PyCalendar.parseText(calendar.text)
# Check for calendar
- if calendar.name != "VCALENDAR":
- raise ValueError("Top-level component is not a calendar: %s" % (calendar.name, ))
+ if calendar is None:
+ raise ValueError("Not a calendar: %s" % (calendar, ))
# Only one component
- comps = list(calendar.components())
+ comps = calendar.getComponents("VFREEBUSY")
if len(comps) != 1:
- raise ValueError("Wrong number of components in calendar")
+ raise ValueError("Wrong number or unexpected components in calendar")
# Must be VFREEBUSY
fb = comps[0]
- if fb.name != "VFREEBUSY":
- raise ValueError("Calendar contains unexpected component: %s" % (fb.name, ))
- # Check for attendee value
- for attendee in [x for x in fb.lines() if x.name == "ATTENDEE"]:
- if attendee.value in users:
+ # Check for attendee value
+ for attendee in fb.getProperties("ATTENDEE"):
+ if attendee.getValue().getValue() in users:
break
else:
continue
@@ -77,16 +72,15 @@
busyp = []
tentativep = []
unavailablep = []
- for fp in [x for x in fb.lines() if x.name == "FREEBUSY"]:
- periods = fp.value
+ for fp in fb.getProperties("FREEBUSY"):
+ periods = fp.getValue().getValues()
# Convert start/duration to start/end
for i in range(len(periods)):
- if isinstance(periods[i][1], datetime.timedelta):
- periods[i] = (periods[i][0], periods[i][0] + periods[i][1])
+ periods[i].getValue().setUseDuration(False)
# Check param
fbtype = "BUSY"
- if "FBTYPE" in fp.params:
- fbtype = fp.params["FBTYPE"][0]
+ if fp.hasAttribute("FBTYPE"):
+ fbtype = fp.getAttributeValue("FBTYPE")
if fbtype == "BUSY":
busyp.extend(periods)
elif fbtype == "BUSY-TENTATIVE":
@@ -104,13 +98,13 @@
# Convert to string sets
busy = set(busy)
- busyp[:] = [periodToString(x) for x in busyp]
+ busyp = [x.getValue().getText() for x in busyp]
busyp = set(busyp)
tentative = set(tentative)
- tentativep[:] = [periodToString(x) for x in tentativep]
+ tentativep = [x.getValue().getText() for x in tentativep]
tentativep = set(tentativep)
unavailable = set(unavailable)
- unavailablep[:] = [periodToString(x) for x in unavailablep]
+ unavailablep = [x.getValue().getText() for x in unavailablep]
unavailablep = set(unavailablep)
# Compare all periods
@@ -123,7 +117,7 @@
break
- except VObjectError:
+ except PyCalendarInvalidData:
return False, " HTTP response data is not a calendar"
except ValueError, txt:
return False, " HTTP response data is invalid: %s" % (txt,)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110317/e14f4480/attachment-0001.html>
More information about the calendarserver-changes
mailing list