[CalendarServer-changes] [7205] CalDAVTester/branches/users/cdaboo/pycalendar

source_changes at macosforge.org source_changes at macosforge.org
Thu Mar 17 10:51:32 PDT 2011


Revision: 7205
          http://trac.macosforge.org/projects/calendarserver/changeset/7205
Author:   cdaboo at apple.com
Date:     2011-03-17 10:51:31 -0700 (Thu, 17 Mar 2011)
Log Message:
-----------
Merge from trunk.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/sharing/freebusy/1.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/sharing/freebusy/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo-template.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/sslserverinfo.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/caldavtest.dtd
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/errors.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/impliciterrors.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/nonascii.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/reports.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/schedulepost.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/sharing-peruser-data.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/caldavtest.dtd
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/put.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/src/caldavtest.py
    CalDAVTester/branches/users/cdaboo/pycalendar/src/request.py
    CalDAVTester/branches/users/cdaboo/pycalendar/verifiers/calendarDataMatch.py
    CalDAVTester/branches/users/cdaboo/pycalendar/verifiers/prepostcondition.py

Added Paths:
-----------
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/3.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/4.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/6.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/7.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/3.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/4.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/6.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/7.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/3.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/4.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/properties/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/properties/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/1.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/10.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/3.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/4.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/6.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/7.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/8.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/9.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/2.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/3.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/4.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/5.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/6.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/7.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/2.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/3.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/4.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/5.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/6.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/7.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/2.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/3.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/4.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/5.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/properties/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/properties/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/1.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/10.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/2.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/3.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/4.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/5.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/6.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/7.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/8.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/9.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/vcardput/12.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/Common/PROPFIND/getctag.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/bulk.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/bulk.xml

Removed Paths:
-------------
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/3.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/4.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/6.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/7.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/3.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/4.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/6.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/7.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/3.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/4.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/properties/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/properties/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/1.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/10.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/3.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/4.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/6.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/7.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/8.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/9.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/2.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/3.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/4.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/5.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/6.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/7.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/2.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/3.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/4.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/5.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/6.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/7.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/2.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/3.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/4.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/5.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/properties/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/properties/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/1.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/10.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/2.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/3.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/4.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/5.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/6.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/7.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/8.vcf
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/9.vcf

Property Changed:
----------------
    CalDAVTester/branches/users/cdaboo/pycalendar/
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/1.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/10.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/11.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/12.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/13.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/14.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/15.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/16.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/17.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/18.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/19.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/2.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/20.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/21.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/22.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/23.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/24.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/25.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/26.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/27.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/28.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/29.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/3.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/30.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/31.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/32.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/4.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/6.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/7.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/8.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/9.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics
    CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/implicitoptions.xml


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar
___________________________________________________________________
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/sharing-5228:5229-5440
/CalDAVTester/trunk:7160-7204

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/1.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<D:prop>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:prop>
-</D:set>
-</MM:resource>
-<MM:resource>
-<D:set>
-<D:prop>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T200000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/1.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/1.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<D:prop>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:prop>
+</D:set>
+</MM:resource>
+<MM:resource>
+<D:set>
+<D:prop>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T200000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/2.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/2.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/2.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/2.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/2.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/2.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/3.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/3.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T200000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/3.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/3.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/3.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/3.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T200000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/4.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/4.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:href>$href1:</D:href>
-<MM:if-match>
-<D:getetag>$etag1:1</D:getetag>
-</MM:if-match>
-<D:set>
-<D:prop>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T193000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1-2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:prop>
-</D:set>
-</MM:resource>
-<MM:resource>
-<D:href>$href2:</D:href>
-<MM:if-match>
-<D:getetag>$etag2:2</D:getetag>
-</MM:if-match>
-<MM:delete/>
-</MM:resource>
-<MM:resource>
-<D:set>
-<D:prop>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid03
-DTSTART;TZID=Etc/GMT+5:$now.0:T220000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 3
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/4.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/4.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/4.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/4.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:href>$href1:</D:href>
+<MM:if-match>
+<D:getetag>$etag1:1</D:getetag>
+</MM:if-match>
+<D:set>
+<D:prop>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T193000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1-2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:prop>
+</D:set>
+</MM:resource>
+<MM:resource>
+<D:href>$href2:</D:href>
+<MM:if-match>
+<D:getetag>$etag2:2</D:getetag>
+</MM:if-match>
+<MM:delete/>
+</MM:resource>
+<MM:resource>
+<D:set>
+<D:prop>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid03
+DTSTART;TZID=Etc/GMT+5:$now.0:T220000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 3
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/5.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/5.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid03
-DTSTART;TZID=Etc/GMT+5:$now.0:T220000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 3
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/5.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/5.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/5.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/5.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid03
+DTSTART;TZID=Etc/GMT+5:$now.0:T220000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 3
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/6.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/6.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:href>$href1:</D:href>
-<MM:if-match>
-<D:getetag>$etag1:</D:getetag>
-</MM:if-match>
-<MM:delete/>
-</MM:resource>
-<MM:resource>
-<D:href>$href2:</D:href>
-<MM:if-match>
-<D:getetag>$etag2:</D:getetag>
-</MM:if-match>
-<D:set>
-<D:prop>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T210000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2-2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/6.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/6.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/6.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/6.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:href>$href1:</D:href>
+<MM:if-match>
+<D:getetag>$etag1:</D:getetag>
+</MM:if-match>
+<MM:delete/>
+</MM:resource>
+<MM:resource>
+<D:href>$href2:</D:href>
+<MM:if-match>
+<D:getetag>$etag2:</D:getetag>
+</MM:if-match>
+<D:set>
+<D:prop>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T210000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2-2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/7.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/7.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T210000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2-2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/7.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-ifmatch/7.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/7.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-ifmatch/7.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T210000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2-2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/1.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/1.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/1.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/2.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/2.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/2.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/2.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/2.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/2.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/3.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/3.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:href>$href1:</D:href>
-<D:set>
-<D:prop>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T190000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1-1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:prop>
-</D:set>
-</MM:resource>
-<MM:resource>
-<D:set>
-<D:prop>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T200000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/3.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/3.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/3.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/3.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:href>$href1:</D:href>
+<D:set>
+<D:prop>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T190000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1-1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:prop>
+</D:set>
+</MM:resource>
+<MM:resource>
+<D:set>
+<D:prop>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T200000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/4.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/4.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T190000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1-1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/4.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/4.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/4.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/4.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T190000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1-1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/5.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/5.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T200000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/5.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/5.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/5.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/5.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T200000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/6.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/6.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:href>$href1:</D:href>
-<D:set>
-<D:prop>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T193000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1-2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:prop>
-</D:set>
-</MM:resource>
-<MM:resource>
-<D:href>$href2:</D:href>
-<MM:delete/>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/6.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/6.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/6.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/6.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:href>$href1:</D:href>
+<D:set>
+<D:prop>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T193000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1-2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:prop>
+</D:set>
+</MM:resource>
+<MM:resource>
+<D:href>$href2:</D:href>
+<MM:delete/>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/7.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/7.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T193000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1-2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/7.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-multiple/7.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/7.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-multiple/7.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T193000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1-2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/1.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/1.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/1.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/2.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/2.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/2.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/2.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/2.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/2.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/3.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/3.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<D:prop>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T190000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1-1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/3.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/3.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/3.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/3.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<D:prop>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T190000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1-1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/4.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/4.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<C:calendar-data><![CDATA[BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T200000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-]]>
-</C:calendar-data>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/4.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/4.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/4.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/4.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<C:calendar-data><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T200000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+]]>
+</C:calendar-data>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/5.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/5.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T200000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/5.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/crud-one/5.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/5.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/crud-one/5.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T200000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/properties/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/properties/1.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/properties/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:" xmlns:MM="http://me.com/_namespace/">
-<D:prop>
-<MM:bulk-requests/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/properties/1.xml (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/properties/1.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/properties/1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/properties/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:MM="http://me.com/_namespace/">
+<D:prop>
+<MM:bulk-requests/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/1.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/1.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/1.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/1.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/1.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/1.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/10.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/10.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,27 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-RRULE:FREQ=DAILY;COUNT=400
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/10.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/10.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/10.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/10.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+RRULE:FREQ=DAILY;COUNT=400
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/2.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/2.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T200000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1-1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/2.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/2.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/2.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/2.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T200000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1-1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/3.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/3.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+5:$now.0:T190000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/3.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/3.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/3.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/3.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+5:$now.0:T190000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/4.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/4.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,48 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T190000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/4.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/4.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/4.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/4.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,48 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T190000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/5.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/5.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/5.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/5.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/5.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/5.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/6.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/6.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid02
-DTSTART;TZID=Etc/GMT+8:$now.0:T190000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/6.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/6.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/6.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/6.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid02
+DTSTART;TZID=Etc/GMT+8:$now.0:T190000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/7.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/7.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,48 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T200000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1-1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid03
-DTSTART;TZID=Etc/GMT+8:$now.0:T210000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 3
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/7.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/7.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/7.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/7.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,48 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T200000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1-1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid03
+DTSTART;TZID=Etc/GMT+8:$now.0:T210000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 3
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/8.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/8.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+8
-X-LIC-LOCATION:Etc/GMT+8
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+8
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid03
-DTSTART;TZID=Etc/GMT+8:$now.0:T210000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 3
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/8.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/8.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/8.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/8.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid03
+DTSTART;TZID=Etc/GMT+8:$now.0:T210000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 3
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/bulk/simple/9.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/9.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,27 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Etc/GMT+5
-X-LIC-LOCATION:Etc/GMT+5
-BEGIN:STANDARD
-DTSTART:18000101T000000
-RDATE:18000101T000000
-TZNAME:GMT+5
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:user01-uid01
-DTSTART;TZID=Etc/GMT+5:$now.0:T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-RRULE:FREQ=DAILY
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/9.ics (from rev 7204, CalDAVTester/trunk/Resource/CalDAV/bulk/simple/9.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/9.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/bulk/simple/9.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:user01-uid01
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+RRULE:FREQ=DAILY
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/1.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/1.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/1.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/10.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/10.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/10.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/11.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/11.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/11.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/12.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/12.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/12.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/13.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/13.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/13.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/14.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/14.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/14.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/15.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/15.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/15.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/16.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/16.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/16.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/17.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/17.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/17.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/18.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/18.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/18.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/19.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/19.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/19.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/2.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/2.ics:7160-7204
/CalDAVTester/trunk/Resource/errors/2.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/20.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/20.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/20.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/21.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/21.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/21.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/22.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/22.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/22.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/23.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/23.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/23.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/24.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/24.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/24.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/25.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/25.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/25.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/26.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/26.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/26.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/27.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/27.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/27.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/28.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/28.ics:7160-7204
/CalDAVTester/trunk/Resource/errors/28.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/29.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/29.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/29.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/3.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/3.ics:7160-7204
/CalDAVTester/trunk/Resource/errors/3.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/30.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/30.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/30.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/31.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/31.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/31.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/32.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/32.xml:7160-7204
/CalDAVTester/trunk/Resource/errors/32.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/4.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/4.ics:7160-7204
/CalDAVTester/trunk/Resource/errors/4.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/5.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/5.ics:7160-7204
/CalDAVTester/trunk/Resource/errors/5.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/6.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/6.ics:7160-7204
/CalDAVTester/trunk/Resource/errors/6.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/7.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/7.ics:7160-7204
/CalDAVTester/trunk/Resource/errors/7.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/8.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/8.ics:7160-7204
/CalDAVTester/trunk/Resource/errors/8.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/errors/9.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/errors/9.ics:7160-7204
/CalDAVTester/trunk/Resource/errors/9.txt:3142


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:7160-7204
/CalDAVTester/trunk/Resource/implicit/schedulechanges/1.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:7160-7204
/CalDAVTester/trunk/Resource/implicit/schedulechanges/2.xml:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:7160-7204
/CalDAVTester/trunk/Resource/implicit/schedulechanges/3.xml:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:7160-7204
/CalDAVTester/trunk/Resource/implicit/schedulechanges/4.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:7160-7204
/CalDAVTester/trunk/Resource/implicit/schedulechanges/5.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:7160-7204
/CalDAVTester/trunk/Resource/implicit/schedulechanges/6.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:7160-7204
/CalDAVTester/trunk/Resource/implicit/schedulechanges/7.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:5229-5440
/CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:7160-7204
/CalDAVTester/trunk/Resource/implicit/schedulechanges/8.ics:2451,3035,3142,3165,3190,3405,3432

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/sharing/freebusy/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/sharing/freebusy/1.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/sharing/freebusy/1.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -2,26 +2,19 @@
 VERSION:2.0
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
 BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
 END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:$now.0:T180000
+DTSTART;TZID=Etc/GMT+5:$now.0:T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/sharing/freebusy/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/sharing/freebusy/2.ics	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/sharing/freebusy/2.ics	2011-03-17 17:51:31 UTC (rev 7205)
@@ -2,26 +2,19 @@
 VERSION:2.0
 PRODID:-//PYVOBJECT//NONSGML Version 1//EN
 BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
 BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
 END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
 END:VTIMEZONE
 BEGIN:VEVENT
 UID:user01-uid
-DTSTART;TZID=US/Eastern:$now.1:T180000
+DTSTART;TZID=Etc/GMT+5:$now.1:T180000
 DURATION:PT1H
 DTSTAMP:20051222T210310Z
 SUMMARY:event 1.2

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/1.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<D:prop>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD
-]]>
-</C:address-data>
-</D:prop>
-</D:set>
-</MM:resource>
-<MM:resource>
-<D:set>
-<D:prop>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD
-]]>
-</C:address-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/1.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/1.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<D:prop>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD
+]]>
+</C:address-data>
+</D:prop>
+</D:set>
+</MM:resource>
+<MM:resource>
+<D:set>
+<D:prop>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD
+]]>
+</C:address-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/2.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/2.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/2.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/2.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/2.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/2.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/2.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/3.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/3.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/3.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/3.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/3.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/3.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/3.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/4.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/4.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:href>$href1:</D:href>
-<MM:if-match>
-<D:getetag>$etag1:1</D:getetag>
-</MM:if-match>
-<D:set>
-<D:prop>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD
-]]>
-</C:address-data>
-</D:prop>
-</D:set>
-</MM:resource>
-<MM:resource>
-<D:href>$href2:</D:href>
-<MM:if-match>
-<D:getetag>$etag2:2</D:getetag>
-</MM:if-match>
-<MM:delete/>
-</MM:resource>
-<MM:resource>
-<D:set>
-<D:prop>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:03;User;;;
-FN:User 03
-EMAIL;type=INTERNET;type=WORK;type=pref:user03 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid03
-END:VCARD
-]]>
-</C:address-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/4.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/4.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/4.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/4.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:href>$href1:</D:href>
+<MM:if-match>
+<D:getetag>$etag1:1</D:getetag>
+</MM:if-match>
+<D:set>
+<D:prop>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD
+]]>
+</C:address-data>
+</D:prop>
+</D:set>
+</MM:resource>
+<MM:resource>
+<D:href>$href2:</D:href>
+<MM:if-match>
+<D:getetag>$etag2:2</D:getetag>
+</MM:if-match>
+<MM:delete/>
+</MM:resource>
+<MM:resource>
+<D:set>
+<D:prop>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:03;User;;;
+FN:User 03
+EMAIL;type=INTERNET;type=WORK;type=pref:user03 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid03
+END:VCARD
+]]>
+</C:address-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/5.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/5.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/5.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:03;User;;;
-FN:User 03
-EMAIL;type=INTERNET;type=WORK;type=pref:user03 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid03
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/5.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/5.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/5.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/5.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:03;User;;;
+FN:User 03
+EMAIL;type=INTERNET;type=WORK;type=pref:user03 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid03
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/6.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/6.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:href>$href1:</D:href>
-<MM:if-match>
-<D:getetag>$etag1:</D:getetag>
-</MM:if-match>
-<MM:delete/>
-</MM:resource>
-<MM:resource>
-<D:href>$href2:</D:href>
-<MM:if-match>
-<D:getetag>$etag2:</D:getetag>
-</MM:if-match>
-<D:set>
-<D:prop>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD
-]]>
-</C:address-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/6.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/6.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/6.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/6.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:href>$href1:</D:href>
+<MM:if-match>
+<D:getetag>$etag1:</D:getetag>
+</MM:if-match>
+<MM:delete/>
+</MM:resource>
+<MM:resource>
+<D:href>$href2:</D:href>
+<MM:if-match>
+<D:getetag>$etag2:</D:getetag>
+</MM:if-match>
+<D:set>
+<D:prop>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD
+]]>
+</C:address-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/7.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/7.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/7.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/7.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-ifmatch/7.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/7.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-ifmatch/7.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/1.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav"  xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD
-]]>
-</C:address-data>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/1.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/1.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav"  xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD
+]]>
+</C:address-data>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/2.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/2.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/2.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/2.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/2.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/2.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/2.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/3.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/3.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:href>$href1:</D:href>
-<D:set>
-<D:prop>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245-1 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD
-]]>
-</C:address-data>
-</D:prop>
-</D:set>
-</MM:resource>
-<MM:resource>
-<D:set>
-<D:prop>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD
-]]>
-</C:address-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/3.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/3.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/3.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/3.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:href>$href1:</D:href>
+<D:set>
+<D:prop>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245-1 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD
+]]>
+</C:address-data>
+</D:prop>
+</D:set>
+</MM:resource>
+<MM:resource>
+<D:set>
+<D:prop>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD
+]]>
+</C:address-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/4.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/4.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/4.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245-1 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/4.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/4.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/4.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/4.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245-1 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/5.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/5.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/5.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/5.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/5.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/5.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/5.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/6.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/6.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:href>$href1:</D:href>
-<D:set>
-<D:prop>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD
-]]>
-</C:address-data>
-</D:prop>
-</D:set>
-</MM:resource>
-<MM:resource>
-<D:href>$href2:</D:href>
-<MM:delete/>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/6.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/6.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/6.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/6.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:href>$href1:</D:href>
+<D:set>
+<D:prop>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD
+]]>
+</C:address-data>
+</D:prop>
+</D:set>
+</MM:resource>
+<MM:resource>
+<D:href>$href2:</D:href>
+<MM:delete/>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/7.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/7.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/7.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/7.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-multiple/7.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/7.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-multiple/7.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245-2 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/1.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav"  xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD
-]]>
-</C:address-data>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/1.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/1.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav"  xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD
+]]>
+</C:address-data>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/2.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/2.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/2.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/2.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/2.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/2.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/2.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/3.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/3.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<D:prop>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;XXXX Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD
-]]>
-</C:address-data>
-</D:prop>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/3.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/3.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/3.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/3.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<D:prop>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;XXXX Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD
+]]>
+</C:address-data>
+</D:prop>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/4.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/4.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
-<MM:resource>
-<D:set>
-<C:address-data><![CDATA[BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD
-]]>
-</C:address-data>
-</D:set>
-</MM:resource>
-</MM:multiput>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/4.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/4.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/4.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/4.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/">
+<MM:resource>
+<D:set>
+<C:address-data><![CDATA[BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD
+]]>
+</C:address-data>
+</D:set>
+</MM:resource>
+</MM:multiput>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/5.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/5.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/5.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/5.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/5.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/5.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/crud-one/5.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/properties/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/properties/1.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/properties/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:" xmlns:MM="http://me.com/_namespace/">
-<D:prop>
-<MM:bulk-requests/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/properties/1.xml (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/properties/1.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/properties/1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/properties/1.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:MM="http://me.com/_namespace/">
+<D:prop>
+<MM:bulk-requests/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/1.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/1.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/1.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/1.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/1.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/1.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/1.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/10.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/10.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/10.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/10.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/10.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/10.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/10.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/2.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/2.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/2.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;XXXX Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/2.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/2.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/2.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/2.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;XXXX Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/3.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/3.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/3.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/3.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/3.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/3.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/3.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/4.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/4.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/4.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,20 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD
-BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/4.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/4.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/4.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/4.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,20 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/5.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/5.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/5.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/5.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/5.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/5.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/5.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/6.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/6.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/6.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:02;User;;;
-FN:User 02
-EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid02
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/6.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/6.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/6.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/6.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:02;User;;;
+FN:User 02
+EMAIL;type=INTERNET;type=WORK;type=pref:user02 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid02
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/7.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/7.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/7.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,20 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;XXXX Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD
-BEGIN:VCARD
-VERSION:3.0
-N:03;User;;;
-FN:User 03
-EMAIL;type=INTERNET;type=WORK;type=pref:user03 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid03
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/7.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/7.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/7.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/7.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,20 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;XXXX Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+N:03;User;;;
+FN:User 03
+EMAIL;type=INTERNET;type=WORK;type=pref:user03 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid03
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/8.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/8.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/8.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:03;User;;;
-FN:User 03
-EMAIL;type=INTERNET;type=WORK;type=pref:user03 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid03
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/8.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/8.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/8.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/8.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:03;User;;;
+FN:User 03
+EMAIL;type=INTERNET;type=WORK;type=pref:user03 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid03
+END:VCARD

Deleted: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/9.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/9.vcf	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/9.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1,10 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:01;User;;;
-FN:User 01
-EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
-TEL;type=WORK;type=pref:1-555-555-5555
-TEL;type=CELL:1-444-444-4444
-ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
-UID:user01-uid01
-END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/9.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/bulk/simple/9.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/9.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/bulk/simple/9.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+N:01;User;;;
+FN:User 01
+EMAIL;type=INTERNET;type=WORK;type=pref:user01 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+UID:user01-uid01
+END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/vcardput/12.vcf (from rev 7204, CalDAVTester/trunk/Resource/CardDAV/vcardput/12.vcf)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/vcardput/12.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV/vcardput/12.vcf	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,12 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Thompson;Default;;;
+FN:Default Thompson
+EMAIL;type=INTERNET;type=WORK;type=pref:lthompson at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+item1.ADR;type=WORK;type=pref:;;1245\, Test;Sesame Street\nOn 
+ The Hill;California;11111;USA
+item1.X-ABADR:us
+UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4EE-12
+END:VCARD

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/Resource/Common/PROPFIND/getctag.xml (from rev 7204, CalDAVTester/trunk/Resource/Common/PROPFIND/getctag.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/Resource/Common/PROPFIND/getctag.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/Resource/Common/PROPFIND/getctag.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<CS:getctag/>
+</D:prop>
+</D:propfind>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo-partitioning.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo-partitioning.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -37,6 +37,7 @@
 		<feature>principal-search-property-set REPORT</feature>	<!-- ACL principal-search-property-set REPORT -->
 
 		<feature>add-member</feature>					<!-- Add-member used to create resources -->
+		<feature>bulk-post</feature>					<!-- Bulk POST requests -->
 		<feature>ctag</feature>							<!-- ctag extension -->
 		<feature>current-user-principal</feature>		<!-- current-user-principal extension -->
 		<feature>directory listing</feature> 			<!-- GET on collection -->
@@ -79,6 +80,10 @@
 	<substitutions>
 		<!-- Useful xpath shortcuts for verifiers -->
 		<substitution>
+			<key>$multistatus-href-prefix:</key>
+			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}href</value>
+		</substitution>
+		<substitution>
 			<key>$verify-property-prefix:</key>
 			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}propstat/{DAV:}prop</value>
 		</substitution>
@@ -87,6 +92,10 @@
 			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}status</value>
 		</substitution>
 		<substitution>
+			<key>$verify-error-response:</key>
+			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}error</value>
+		</substitution>
+		<substitution>
 			<key>$CALDAV:</key>
 			<value>urn:ietf:params:xml:ns:caldav</value>
 		</substitution>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo-template.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo-template.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -37,6 +37,7 @@
 		<feature>principal-search-property-set REPORT</feature>	<!-- ACL principal-search-property-set REPORT -->
 
 		<feature>add-member</feature>					<!-- Add-member used to create resources -->
+		<feature>bulk-post</feature>					<!-- Bulk POST requests -->
 		<feature>ctag</feature>							<!-- ctag extension -->
 		<feature>current-user-principal</feature>		<!-- current-user-principal extension -->
 		<feature>directory listing</feature> 			<!-- GET on collection -->
@@ -81,6 +82,10 @@
 	<substitutions>
 		<!-- Useful xpath shortcuts for verifiers -->
 		<substitution>
+			<key>$multistatus-href-prefix:</key>
+			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}href</value>
+		</substitution>
+		<substitution>
 			<key>$verify-property-prefix:</key>
 			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}propstat/{DAV:}prop</value>
 		</substitution>
@@ -89,6 +94,10 @@
 			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}status</value>
 		</substitution>
 		<substitution>
+			<key>$verify-error-response:</key>
+			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}error</value>
+		</substitution>
+		<substitution>
 			<key>$CALDAV:</key>
 			<value>urn:ietf:params:xml:ns:caldav</value>
 		</substitution>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/serverinfo.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -37,6 +37,7 @@
 		<feature>principal-search-property-set REPORT</feature>	<!-- ACL principal-search-property-set REPORT -->
 
 		<feature>add-member</feature>					<!-- Add-member used to create resources -->
+		<feature>bulk-post</feature>					<!-- Bulk POST requests -->
 		<feature>ctag</feature>							<!-- ctag extension -->
 		<feature>current-user-principal</feature>		<!-- current-user-principal extension -->
 		<feature>directory listing</feature> 			<!-- GET on collection -->
@@ -81,6 +82,10 @@
 	<substitutions>
 		<!-- Useful xpath shortcuts for verifiers -->
 		<substitution>
+			<key>$multistatus-href-prefix:</key>
+			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}href</value>
+		</substitution>
+		<substitution>
 			<key>$verify-property-prefix:</key>
 			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}propstat/{DAV:}prop</value>
 		</substitution>
@@ -89,6 +94,10 @@
 			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}status</value>
 		</substitution>
 		<substitution>
+			<key>$verify-error-response:</key>
+			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}error</value>
+		</substitution>
+		<substitution>
 			<key>$CALDAV:</key>
 			<value>urn:ietf:params:xml:ns:caldav</value>
 		</substitution>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/sslserverinfo.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/server/sslserverinfo.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -38,6 +38,7 @@
 		<feature>principal-search-property-set REPORT</feature>	<!-- ACL principal-search-property-set REPORT -->
 
 		<feature>add-member</feature>					<!-- Add-member used to create resources -->
+		<feature>bulk-post</feature>					<!-- Bulk POST requests -->
 		<feature>ctag</feature>							<!-- ctag extension -->
 		<feature>current-user-principal</feature>		<!-- current-user-principal extension -->
 		<feature>directory listing</feature> 			<!-- GET on collection -->
@@ -80,6 +81,10 @@
 	<substitutions>
 		<!-- Useful xpath shortcuts for verifiers -->
 		<substitution>
+			<key>$multistatus-href-prefix:</key>
+			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}href</value>
+		</substitution>
+		<substitution>
 			<key>$verify-property-prefix:</key>
 			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}propstat/{DAV:}prop</value>
 		</substitution>
@@ -88,6 +93,10 @@
 			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}status</value>
 		</substitution>
 		<substitution>
+			<key>$verify-error-response:</key>
+			<value>/{DAV:}multistatus/{DAV:}response/{DAV:}error</value>
+		</substitution>
+		<substitution>
 			<key>$CALDAV:</key>
 			<value>urn:ietf:params:xml:ns:caldav</value>
 		</substitution>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/bulk.xml (from rev 7204, CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/bulk.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/bulk.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,1245 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ 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.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test bulk POST method in CalDAV</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>bulk-post</feature>
+	</require-feature>
+
+	<start/>
+	
+	<test-suite name='bulk-requests property'>
+		<test name='1'>
+			<description>PROPFIND on calendar</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$calendarpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/properties/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{http://me.com/_namespace/}bulk-requests/{http://me.com/_namespace/}simple</value>
+						<value>$verify-property-prefix:/{http://me.com/_namespace/}bulk-requests/{http://me.com/_namespace/}crud</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>PROPFIND on calendar home</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/properties/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{http://me.com/_namespace/}bulk-requests/{http://me.com/_namespace/}simple</value>
+						<value>$verify-property-prefix:/{http://me.com/_namespace/}bulk-requests/{http://me.com/_namespace/}crud</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Simple POST - one event' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST single new event</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/simple/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/simple/1.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST single existing event</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/simple/2.ics</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-bad-response:[*403]</value>
+						<value>$verify-error-response:/{urn:ietf:params:xml:ns:caldav}no-uid-conflict</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/simple/1.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>POST single new different event</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/simple/3.ics</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/simple/3.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Simple POST - multiple events' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST multiple new events</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/simple/4.ics</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag1:</variable>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/simple/5.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/simple/6.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>POST one new, one exsting events</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/simple/7.ics</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid03]</value>
+						<value>$verify-bad-response:[*403]</value>
+						<value>$verify-error-response:/{urn:ietf:params:xml:ns:caldav}no-uid-conflict</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href-ignore:</variable>
+					<variable>$href3:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag3:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>Check unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/simple/5.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href3:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/simple/8.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag3:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Simple POST - one event return data' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST single new event</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<header>
+					<name>X-MobileMe-DAV-Options</name>
+					<value>return-changed-data</value>
+				</header>
+				<data substitutions='yes'>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/simple/9.ics</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</name>
+					<variable>$data:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/simple/10.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>Check valid data against returned data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>data</name>
+						<value>$data:</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Simple POST - ctag condition' ignore='no'>
+		<test name='1'>
+			<description>PROPFIND on calendar</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$calendarpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/getctag.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<grabelement>
+					<name>$verify-property-prefix:/{http://calendarserver.org/ns/}getctag</name>
+					<variable>$ctag:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>POST single new event conditional fail</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<header>
+					<name>X-MobileMe-DAV-Options</name>
+					<value>return-changed-data</value>
+				</header>
+				<header>
+					<name>If</name>
+					<value><![CDATA[<http://me.com/_namespace/ctag/$ctag:123>]]></value>
+				</header>
+				<data substitutions='yes'>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/simple/9.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>412</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST single new event conditional ok</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<header>
+					<name>X-MobileMe-DAV-Options</name>
+					<value>return-changed-data</value>
+				</header>
+				<header>
+					<name>If</name>
+					<value><![CDATA[<http://me.com/_namespace/ctag/$ctag:>]]></value>
+				</header>
+				<data substitutions='yes'>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/simple/9.ics</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>CTag</name>
+					<variable>$ctag-new:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='4'>
+			<description>PROPFIND on calendar</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$calendarpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/getctag.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}getctag[=$ctag-new:]</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}getctag[!$ctag:]</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='CRUD POST - one event create' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST single new event</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/crud-one/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-one/2.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST single existing event</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/crud-one/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-bad-response:[*403]</value>
+						<value>$verify-error-response:/{urn:ietf:params:xml:ns:caldav}no-uid-conflict</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-one/2.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>POST single new different event</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/crud-one/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-one/5.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='CRUD POST - multiple' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST single new event</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/crud-multiple/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag1:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-multiple/2.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST add new and update existing</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/crud-multiple/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag1:</variable>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Data changed</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-multiple/4.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-multiple/5.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>POST delete and update existing</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/crud-multiple/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='7' ignore='no'>
+			<description>Data changed</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-multiple/7.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8' ignore='no'>
+			<description>Data gone</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>404</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='CRUD POST - multiple if-match' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST two new events</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/crud-ifmatch/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag1:</variable>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-ifmatch/2.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-ifmatch/3.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>POST new, update and delete existing - if-match fail</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/crud-ifmatch/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid03]</value>
+						<value>$verify-bad-response:[*412]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+					<variable>$href3:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag3:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-ifmatch/2.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-ifmatch/3.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href3:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-ifmatch/5.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag3:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8' ignore='no'>
+			<description>POST update and delete existing - if-match ok</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/bulk/crud-ifmatch/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='9' ignore='no'>
+			<description>Data gone</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>404</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='10' ignore='no'>
+			<description>Data changed</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-ifmatch/7.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='11' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href3:</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/bulk/crud-ifmatch/5.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag3:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/caldavtest.dtd	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/caldavtest.dtd	2011-03-17 17:51:31 UTC (rev 7205)
@@ -58,7 +58,7 @@
 			<!ELEMENT property (#PCDATA)>
 			<!ELEMENT variable (#PCDATA)>
 
-		<!ELEMENT grabelement (name, variable)>
+		<!ELEMENT grabelement (name, variable+)>
 
 	<!ELEMENT test-suite (require-feature?, exclude-feature?, test*)>
 		<!ATTLIST test-suite name CDATA #REQUIRED

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/errors.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/errors.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -195,7 +195,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -358,7 +357,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -395,7 +393,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -414,7 +411,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-object-resource</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -433,7 +429,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-object-resource</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -470,7 +465,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -558,7 +552,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -823,7 +816,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -1373,7 +1365,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/impliciterrors.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/impliciterrors.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/impliciterrors.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -479,7 +479,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}attendee-allowed</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>


Property changes on: CalDAVTester/branches/users/cdaboo/pycalendar/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/sharing-5228/scripts/tests/CalDAV/implicitoptions.xml:5229-5440
/CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml:7160-7204

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/nonascii.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/nonascii.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/nonascii.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -404,7 +404,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -423,7 +422,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -442,7 +440,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -481,7 +478,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -500,7 +496,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -544,7 +539,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/reports.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/reports.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -1213,7 +1213,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/schedulepost.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/schedulepost.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/schedulepost.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -167,8 +167,7 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
-					</arg>
+s					</arg>
 				</verify>
 			</request>
 		</test>
@@ -186,7 +185,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -205,7 +203,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/sharing-peruser-data.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/sharing-peruser-data.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/sharing-peruser-data.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -654,7 +654,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>
@@ -687,7 +686,6 @@
 					<arg>
 						<name>error</name>
 						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-						<value>{http://twistedmatrix.com/xml_namespace/dav/}error-description</value>
 					</arg>
 				</verify>
 			</request>

Copied: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/bulk.xml (from rev 7204, CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/bulk.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/bulk.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -0,0 +1,1222 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE CardDAVtest SYSTEM "CardDAVtest.dtd">
+
+<!--
+ 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.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test bulk POST method in CardDAV</description>
+
+	<require-feature>
+		<feature>carddav</feature>
+		<feature>bulk-post</feature>
+	</require-feature>
+
+	<start/>
+	
+	<test-suite name='bulk-requests property'>
+		<test name='1'>
+			<description>PROPFIND on address book</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/properties/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{http://me.com/_namespace/}bulk-requests/{http://me.com/_namespace/}simple</value>
+						<value>$verify-property-prefix:/{http://me.com/_namespace/}bulk-requests/{http://me.com/_namespace/}crud</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>PROPFIND on addressbook home</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$addressbookhome1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/properties/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{http://me.com/_namespace/}bulk-requests/{http://me.com/_namespace/}simple</value>
+						<value>$verify-property-prefix:/{http://me.com/_namespace/}bulk-requests/{http://me.com/_namespace/}crud</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Simple POST - one vcard' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST single new vcard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/simple/1.vcf</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/simple/1.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST single existing vcard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/simple/2.vcf</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-bad-response:[*403]</value>
+						<value>$verify-error-response:/{urn:ietf:params:xml:ns:carddav}no-uid-conflict</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/simple/1.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>POST single new different vcard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/simple/3.vcf</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/simple/3.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Simple POST - multiple vcards' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST multiple new vcards</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/simple/4.vcf</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag1:</variable>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/simple/5.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/simple/6.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>POST one new, one exsting vcards</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/simple/7.vcf</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid03]</value>
+						<value>$verify-bad-response:[*403]</value>
+						<value>$verify-error-response:/{urn:ietf:params:xml:ns:carddav}no-uid-conflict</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href-ignore:</variable>
+					<variable>$href3:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag3:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>Check unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/simple/5.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href3:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/simple/8.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag3:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Simple POST - one vcard return data' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST single new vcard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<header>
+					<name>X-MobileMe-DAV-Options</name>
+					<value>return-changed-data</value>
+				</header>
+				<data substitutions='yes'>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/simple/9.vcf</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/simple/10.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Simple POST - ctag condition' ignore='no'>
+		<test name='1'>
+			<description>PROPFIND on address book</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/getctag.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<grabelement>
+					<name>$verify-property-prefix:/{http://calendarserver.org/ns/}getctag</name>
+					<variable>$ctag:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>POST single new vcard conditional fail</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<header>
+					<name>X-MobileMe-DAV-Options</name>
+					<value>return-changed-data</value>
+				</header>
+				<header>
+					<name>If</name>
+					<value><![CDATA[<http://me.com/_namespace/ctag/$ctag:123>]]></value>
+				</header>
+				<data substitutions='yes'>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/simple/9.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>412</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST single new vcard conditional ok</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<header>
+					<name>X-MobileMe-DAV-Options</name>
+					<value>return-changed-data</value>
+				</header>
+				<header>
+					<name>If</name>
+					<value><![CDATA[<http://me.com/_namespace/ctag/$ctag:>]]></value>
+				</header>
+				<data substitutions='yes'>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/simple/9.vcf</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>CTag</name>
+					<variable>$ctag-new:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='4'>
+			<description>PROPFIND on address book</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/getctag.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}getctag[=$ctag-new:]</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}getctag[!$ctag:]</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='CRUD POST - one vcard create' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST single new vcard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/crud-one/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-one/2.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST single existing vcard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/crud-one/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-bad-response:[*403]</value>
+						<value>$verify-error-response:/{urn:ietf:params:xml:ns:carddav}no-uid-conflict</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-one/2.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>POST single new different vcard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/crud-one/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-one/5.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='CRUD POST - multiple' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST single new vcard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/crud-multiple/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag1:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check valid data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-multiple/2.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST add new and update existing</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/crud-multiple/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag1:</variable>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Data changed</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-multiple/4.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-multiple/5.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>POST delete and update existing</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/crud-multiple/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='7' ignore='no'>
+			<description>Data changed</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-multiple/7.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8' ignore='no'>
+			<description>Data gone</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>404</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='CRUD POST - multiple if-match' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST two new vcards</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/crud-ifmatch/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid01]</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid02]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag1:</variable>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-ifmatch/2.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-ifmatch/3.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>POST new, update and delete existing - if-match fail</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/crud-ifmatch/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+						<value>$verify-property-prefix:/{http://calendarserver.org/ns/}uid[=user01-uid03]</value>
+						<value>$verify-bad-response:[*412]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+					<variable>$href3:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag3:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-ifmatch/2.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag1:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-ifmatch/3.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href3:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-ifmatch/5.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag3:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8' ignore='no'>
+			<description>POST update and delete existing - if-match ok</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/bulk/crud-ifmatch/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}getetag</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}address-data</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>$multistatus-href-prefix:</name>
+					<variable>$href1:</variable>
+					<variable>$href2:</variable>
+				</grabelement>
+				<grabelement>
+					<name>$verify-property-prefix:/{DAV:}getetag</name>
+					<variable>$etag2:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='9' ignore='no'>
+			<description>Data gone</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href1:</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>404</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='10' ignore='no'>
+			<description>Data changed</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href2:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-ifmatch/7.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag2:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='11' ignore='no'>
+			<description>Data unchanged</description>
+			<request>
+				<method>GET</method>
+				<ruri>$href3:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/bulk/crud-ifmatch/5.vcf</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>ETag</name>
+						<value>$etag3:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/caldavtest.dtd	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/caldavtest.dtd	2011-03-17 17:51:31 UTC (rev 7205)
@@ -21,13 +21,15 @@
 
 	<!ELEMENT require-feature (feature*)>
 		<!ELEMENT feature (#PCDATA)>
+	<!ELEMENT exclude-feature (feature*)>
+		<!ELEMENT feature (#PCDATA)>
 
 	<!ELEMENT start (request*)>
 	<!ELEMENT end (request*)>
 
 	<!ELEMENT pause EMPTY>
 
-	<!ELEMENT request (require-feature?, method, ruri*, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
+	<!ELEMENT request (require-feature?, exclude-feature?, method, ruri*, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
 		<!ATTLIST request auth (yes|no) "yes"
 						 user CDATA ""
 						 pswd CDATA ""
@@ -56,13 +58,13 @@
 			<!ELEMENT property (#PCDATA)>
 			<!ELEMENT variable (#PCDATA)>
 
-		<!ELEMENT grabelement (name, variable)>
+		<!ELEMENT grabelement (name, variable+)>
 
-	<!ELEMENT test-suite (require-feature?, test*)>
+	<!ELEMENT test-suite (require-feature?, exclude-feature?, test*)>
 		<!ATTLIST test-suite name CDATA #REQUIRED
 							ignore (yes|no) "no">
 	
-		<!ELEMENT test (require-feature?, description?, (request|pause)+)>
+		<!ELEMENT test (require-feature?, exclude-feature?, description?, (request|pause)+)>
 			<!ATTLIST test name CDATA #REQUIRED
 						  count CDATA "1"
 						  stats (yes|no) "no"

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/put.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/put.xml	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV/put.xml	2011-03-17 17:51:31 UTC (rev 7205)
@@ -27,7 +27,7 @@
 
 	<start/>	
 
-	<test-suite name='PUT VCARD'>
+	<test-suite name='PUT VCARD' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>PUT simple person contact</description>
 			<request end-delete='yes' print-response='yes'>
@@ -383,6 +383,38 @@
 				</verify>
 			</request>
 		</test>
+		<test name='2' ignore='no'>
+			<description>PUT with \n in ADR</description>
+			<request end-delete='yes' print-response='yes'>
+				<method>PUT</method>
+				<ruri>$addressbookpath1:/12.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/vcardput/12.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>ETag</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/12.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/vcardput/12.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 
 	<end/>

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/src/caldavtest.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/src/caldavtest.py	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/src/caldavtest.py	2011-03-17 17:51:31 UTC (rev 7205)
@@ -559,14 +559,18 @@
                         self.manager.server_info.addextrasubs({variable: propvalue.encode("utf-8")})
 
         if req.grabelement:
-            for elementpath, variable in req.grabelement:
+            for elementpath, variables in req.grabelement:
                 # grab the property here
-                elementvalue = self.extractElement(elementpath, respdata)
-                if elementvalue == None:
+                elementvalues = self.extractElements(elementpath, respdata)
+                if elementvalues == None:
                     result = False
-                    resulttxt += "\Element %s was not extracted from response\n" % (elementpath,)
+                    resulttxt += "\nElement %s was not extracted from response\n" % (elementpath,)
+                elif len(variables) != len(elementvalues):
+                    result = False
+                    resulttxt += "\n%d found but expecting %d for element %s from response\n" % (len(elementvalues), len(variables), elementpath,)
                 else:
-                    self.manager.server_info.addextrasubs({variable: elementvalue.encode("utf-8")})
+                    for variable, elementvalue in zip(variables, elementvalues):
+                        self.manager.server_info.addextrasubs({variable: elementvalue.encode("utf-8") if elementvalue else ""})
 
         return result, resulttxt, response, respdata
 
@@ -695,6 +699,32 @@
         else:
             return None
 
+    def extractElements(self, elementpath, respdata):
+
+        try:
+            tree = ElementTree()
+            tree.parse(StringIO(respdata))
+        except:
+            return None
+        
+        # Strip off the top-level item
+        if elementpath[0] == '/':
+            elementpath = elementpath[1:]
+            splits = elementpath.split('/', 1)
+            root = splits[0]
+            if tree.getroot().tag != root:
+                return None
+            elif len(splits) == 1:
+                return tree.getroot().text
+            else:
+                elementpath = splits[1]
+                
+        e = tree.findall(elementpath)
+        if e is not None:
+            return [item.text for item in e]
+        else:
+            return None
+
     def postgresInit(self):
         """
         Initialize postgres statement counter

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/src/request.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/src/request.py	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/src/request.py	2011-03-17 17:51:31 UTC (rev 7205)
@@ -331,7 +331,7 @@
             elif child.tag == src.xmlDefs.ELEMENT_GRABPROPERTY:
                 self.parseGrab(child, self.grabproperty)
             elif child.tag == src.xmlDefs.ELEMENT_GRABELEMENT:
-                self.parseGrab(child, self.grabelement)
+                self.parseMultiGrab(child, self.grabelement)
 
     def parseFeatures(self, node, require=True):
         for child in node.getchildren():
@@ -376,7 +376,22 @@
         
         if (name is not None) and (variable is not None):
             appendto.append((name, variable))
-            
+
+    def parseMultiGrab(self, node, appendto):
+        
+        name = None
+        variable = None
+        for child in node.getchildren():
+            if child.tag in (src.xmlDefs.ELEMENT_NAME, src.xmlDefs.ELEMENT_PROPERTY):
+                name = self.manager.server_info.subs(child.text.encode("utf-8"))
+            elif child.tag == src.xmlDefs.ELEMENT_VARIABLE:
+                if variable is None:
+                    variable = []
+                variable.append(self.manager.server_info.subs(child.text.encode("utf-8")))
+        
+        if (name is not None) and (variable is not None):
+            appendto.append((name, variable))
+    
 class data( object ):
     """
     Represents the data/body portion of an HTTP request.

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/verifiers/calendarDataMatch.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/verifiers/calendarDataMatch.py	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/verifiers/calendarDataMatch.py	2011-03-17 17:51:31 UTC (rev 7205)
@@ -27,6 +27,7 @@
     def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
         # Get arguments
         files = args.get("filepath", [])
+        caldata = args.get("data", [])
         filters = args.get("filter", [])
         
         if "EMAIL parameter" not in manager.server_info.features:
@@ -46,18 +47,21 @@
             return False, "        No response body"
         
         # look for one file
-        if len(files) != 1:
+        if len(files) != 1 and len(caldata) != 1:
             return False, "        No file to compare response to"
         
-        # read in all data from specified file
-        fd = open( files[0], "r" )
-        try:
+        # read in all data from specified file or use provided data
+        if len(files):
+            fd = open( files[0], "r" )
             try:
-                data = fd.read()
-            finally:
-                fd.close()
-        except:
-            data = None
+                try:
+                    data = fd.read()
+                finally:
+                    fd.close()
+            except:
+                data = None
+        else:
+            data = caldata[0] if len(caldata) else None
 
         if data is None:
             return False, "        Could not read data file"

Modified: CalDAVTester/branches/users/cdaboo/pycalendar/verifiers/prepostcondition.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/pycalendar/verifiers/prepostcondition.py	2011-03-17 01:27:43 UTC (rev 7204)
+++ CalDAVTester/branches/users/cdaboo/pycalendar/verifiers/prepostcondition.py	2011-03-17 17:51:31 UTC (rev 7205)
@@ -48,7 +48,8 @@
         expected = set(teststatus)
         got = set()
         for child in tree.getroot().getchildren():
-            got.add(child.tag)
+            if child.tag != "{http://twistedmatrix.com/xml_namespace/dav/}error-description":
+                got.add(child.tag)
         
         missing = expected.difference(got)
         extras = got.difference(expected)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110317/b3be4306/attachment-0001.html>


More information about the calendarserver-changes mailing list