[CalendarServer-changes] [5441] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 5441
          http://trac.macosforge.org/projects/calendarserver/changeset/5441
Author:   cdaboo at apple.com
Date:     2010-04-07 12:59:00 -0700 (Wed, 07 Apr 2010)
Log Message:
-----------
Merged shared calendar support.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics
    CalDAVTester/trunk/scripts/server/serverinfo-carddav.xml
    CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/server/sslserverinfo.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/get.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
    CalDAVTester/trunk/src/caldavtest.py

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/sharing/
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcalendar/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcalendar/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcol/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcol/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/upgrade_collection/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/upgrade_collection/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/7.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml
    CalDAVTester/trunk/Resource/Common/
    CalDAVTester/trunk/Resource/Common/MKCALENDAR/
    CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml
    CalDAVTester/trunk/Resource/Common/POST/
    CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml
    CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml
    CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml
    CalDAVTester/trunk/Resource/Common/PROPFIND/
    CalDAVTester/trunk/Resource/Common/PROPFIND/count.xml
    CalDAVTester/trunk/Resource/Common/PROPFIND/resourcetype.xml
    CalDAVTester/trunk/Resource/Common/PROPPATCH/
    CalDAVTester/trunk/Resource/Common/PROPPATCH/calendar-transp-opaque.xml
    CalDAVTester/trunk/scripts/server/serverinfo-sun.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
    CalDAVTester/trunk/verifiers/postFreeBusy.py
    CalDAVTester/trunk/verifiers/xmlDataMatch.py

Removed Paths:
-------------
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcalendar/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcalendar/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcol/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcol/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/upgrade_collection/
    CalDAVTester/trunk/Resource/CalDAV/sharing/feature/upgrade_collection/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/4.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/7.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml
    CalDAVTester/trunk/Resource/Common/MKCALENDAR/
    CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml
    CalDAVTester/trunk/Resource/Common/POST/
    CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml
    CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml
    CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml
    CalDAVTester/trunk/Resource/Common/PROPFIND/
    CalDAVTester/trunk/Resource/Common/PROPFIND/count.xml
    CalDAVTester/trunk/Resource/Common/PROPFIND/resourcetype.xml
    CalDAVTester/trunk/Resource/Common/PROPPATCH/
    CalDAVTester/trunk/Resource/Common/PROPPATCH/calendar-transp-opaque.xml

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


Property changes on: CalDAVTester/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/trunk:2451,3035,3142,3165,3190,3405,3432,3858,3940
   + /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


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/1.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/1.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/1.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/1.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/1.xml:3534-3558
/CalDAVTester/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/errors/1.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/10.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/10.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/10.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/10.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/10.xml:3534-3558
/CalDAVTester/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/errors/10.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/11.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/11.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/11.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/11.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/11.xml:3534-3558
/CalDAVTester/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/errors/11.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/12.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/12.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/12.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/12.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/12.xml:3534-3558
/CalDAVTester/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/errors/12.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/13.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/13.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/13.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/13.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/13.xml:3534-3558
/CalDAVTester/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/errors/13.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/14.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/14.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/14.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/14.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/14.xml:3534-3558
/CalDAVTester/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/errors/14.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/15.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/15.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/15.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/15.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/15.xml:3534-3558
/CalDAVTester/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/errors/15.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/16.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/16.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/16.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/16.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/16.xml:3534-3558
/CalDAVTester/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/errors/16.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/17.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/17.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/17.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/17.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/17.xml:3534-3558
/CalDAVTester/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/errors/17.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/18.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/18.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/18.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/18.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/18.xml:3534-3558
/CalDAVTester/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/errors/18.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/19.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/19.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/19.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/19.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/19.xml:3534-3558
/CalDAVTester/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/errors/19.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/2.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/2.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/2.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/2.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/2.ics:3534-3558
/CalDAVTester/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/errors/2.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/20.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/20.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/20.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/20.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/20.xml:3534-3558
/CalDAVTester/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/errors/20.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/21.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/21.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/21.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/21.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/21.xml:3534-3558
/CalDAVTester/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/errors/21.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/22.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/22.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/22.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/22.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/22.xml:3534-3558
/CalDAVTester/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/errors/22.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/23.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/23.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/23.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/23.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/23.xml:3534-3558
/CalDAVTester/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/errors/23.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/24.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/24.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/24.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/24.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/24.xml:3534-3558
/CalDAVTester/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/errors/24.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/25.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/25.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/25.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/25.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/25.xml:3534-3558
/CalDAVTester/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/errors/25.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/26.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/26.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/26.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/26.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/26.xml:3534-3558
/CalDAVTester/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/errors/26.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/27.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/27.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/27.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/27.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/27.xml:3534-3558
/CalDAVTester/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/errors/27.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/28.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/28.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/28.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/28.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/28.ics:3534-3558
/CalDAVTester/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/errors/28.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/29.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/29.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/29.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/29.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/29.xml:3534-3558
/CalDAVTester/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/errors/29.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/3.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/3.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/3.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/3.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/3.ics:3534-3558
/CalDAVTester/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/errors/3.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/30.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/30.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/30.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/30.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/30.xml:3534-3558
/CalDAVTester/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/errors/30.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/31.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/31.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/31.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/31.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/31.xml:3534-3558
/CalDAVTester/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/errors/31.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/32.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/32.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/32.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/32.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/32.xml:3534-3558
/CalDAVTester/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/errors/32.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/4.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/4.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/4.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/4.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/4.ics:3534-3558
/CalDAVTester/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/errors/4.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/5.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/5.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/5.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/5.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/5.ics:3534-3558
/CalDAVTester/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/errors/5.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/6.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/6.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/6.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/6.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/6.ics:3534-3558
/CalDAVTester/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/errors/6.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/7.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/7.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/7.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/7.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/7.ics:3534-3558
/CalDAVTester/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/errors/7.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/8.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/8.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/8.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/8.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/8.ics:3534-3558
/CalDAVTester/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/errors/8.txt:3142


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/9.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/9.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/9.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/9.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/9.ics:3534-3558
/CalDAVTester/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/errors/9.txt:3142

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/2.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -15,60 +15,4 @@
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060105T000000Z
-DTEND:20060105T010000Z
-RECURRENCE-ID:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/3.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto6/suite6/3.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -15,60 +15,4 @@
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060105T000000Z
-DTEND:20060105T010000Z
-RECURRENCE-ID:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -36,7 +36,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -38,7 +38,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -37,7 +37,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -38,7 +38,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -38,7 +38,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -38,7 +38,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000


Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/1.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/1.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/1.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/1.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/1.ics:3534-3558
/CalDAVTester/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/implicit/schedulechanges/1.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/2.xml:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/2.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/2.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/2.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/2.xml:3534-3558
/CalDAVTester/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/implicit/schedulechanges/2.xml:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/3.xml:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/3.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/3.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/3.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/3.xml:3534-3558
/CalDAVTester/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/implicit/schedulechanges/3.xml:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/4.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/4.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/4.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/4.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/4.ics:3534-3558
/CalDAVTester/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/implicit/schedulechanges/4.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/5.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/5.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/5.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/5.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/5.ics:3534-3558
/CalDAVTester/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/implicit/schedulechanges/5.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/6.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/6.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/6.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/6.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/6.ics:3534-3558
/CalDAVTester/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/implicit/schedulechanges/6.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/7.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/7.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/7.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/7.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/7.ics:3534-3558
/CalDAVTester/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/implicit/schedulechanges/7.ics:2451,3035,3142,3165,3190,3405,3432


Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/8.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/8.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/8.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/8.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/8.ics:3534-3558
/CalDAVTester/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/implicit/schedulechanges/8.ics:2451,3035,3142,3165,3190,3405,3432

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-    <CS:set>
-        <D:href>mailto:user02 at example.com</D:href>
-        <CS:summary>My Shared Calendar</CS:summary>
-        <CS:read/>
-    </CS:set>
-</CS:share>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:set>
+        <D:href>mailto:user02 at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read/>
+    </CS:set>
+</CS:share>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-notification shared-type='calendar'>
-    <uid></uid>
-    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-    <invite-accepted/>
-    <access>
-      <read/>
-    </access>
-    <hosturl>
-      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-    </hosturl>
-    <organizer>
-      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
-    </organizer>
-    <summary>My Shared Calendar</summary>
-  </invite-notification>
-</notification>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+    <invite-accepted/>
+    <access>
+      <read/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+  </invite-notification>
+</notification>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<invite-reply xmlns='http://calendarserver.org/ns/'>
-  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-  <invite-accepted/>
-  <hosturl>
-    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-  </hosturl>
-  <in-reply-to>$inviteuid:</in-reply-to>
-  <summary>The Shared Calendar</summary>
-</invite-reply>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuid:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+</invite-reply>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/4.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/4.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:resourcetype/>
-<D:owner/>
-<D:current-user-privilege-set/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/4.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/4.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/4.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+<D:owner/>
+<D:current-user-privilege-set/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/5.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,29 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:54E181BC7CCC373042B28842-1 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-DTSTAMP:20051222T205953Z
-SUMMARY:event 1
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/5.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/5.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:54E181BC7CCC373042B28842-1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/6.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,29 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:54E181BC7CCC373042B28842-6 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-DTSTAMP:20051222T205953Z
-SUMMARY:event 6
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-only/6.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/6.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:54E181BC7CCC373042B28842-6 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 6
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-    <CS:set>
-        <D:href>mailto:user02 at example.com</D:href>
-        <CS:summary>My Shared Calendar</CS:summary>
-        <CS:read-write/>
-    </CS:set>
-</CS:share>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:set>
+        <D:href>mailto:user02 at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-notification shared-type='calendar'>
-    <uid></uid>
-    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-    <invite-noresponse/>
-    <access>
-      <read-write/>
-    </access>
-    <hosturl>
-      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-    </hosturl>
-    <organizer>
-      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
-    </organizer>
-    <summary>My Shared Calendar</summary>
-  </invite-notification>
-</notification>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+    <invite-noresponse/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+  </invite-notification>
+</notification>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<invite-reply xmlns='http://calendarserver.org/ns/'>
-  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-  <invite-accepted/>
-  <hosturl>
-    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-  </hosturl>
-  <in-reply-to>$inviteuid:</in-reply-to>
-  <summary>The Shared Calendar</summary>
-</invite-reply>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuid:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+</invite-reply>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/4.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/4.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:resourcetype/>
-<D:owner/>
-<D:current-user-privilege-set/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/4.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/4.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/4.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+<D:owner/>
+<D:current-user-privilege-set/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/5.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,29 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:54E181BC7CCC373042B28842-2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-DTSTAMP:20051222T205953Z
-SUMMARY:event 1
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/5.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/5.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:54E181BC7CCC373042B28842-2 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/6.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,29 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:54E181BC7CCC373042B28842-2 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT4H
-DTSTAMP:20051222T205953Z
-SUMMARY:event 4
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/6.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/6.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:54E181BC7CCC373042B28842-2 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT4H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 4
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/7.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,29 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:54E181BC7CCC373042B28842-7 at ninevah.local
-DTSTART;TZID=US/Eastern:20060201T100000
-DURATION:PT1H
-DTSTAMP:20051222T205953Z
-SUMMARY:event 7
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/7.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/7.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:54E181BC7CCC373042B28842-7 at ninevah.local
+DTSTART;TZID=US/Eastern:20060201T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 7
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/8.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,29 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:54E181BC7CCC373042B28842-7 at ninevah.local
-DTSTART;TZID=US/Eastern:20060201T100000
-DURATION:PT7H
-DTSTAMP:20051222T205953Z
-SUMMARY:event 7-1
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/calendars/read-write/8.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/8.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:54E181BC7CCC373042B28842-7 at ninevah.local
+DTSTART;TZID=US/Eastern:20060201T100000
+DURATION:PT7H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 7-1
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/downgrade_collection/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
-<D:set>
-<D:prop>
-<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
-</D:prop>
-</D:set>
-</D:propertyupdate>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/downgrade_collection/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
+<D:set>
+<D:prop>
+<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/downgrade_collection/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
-<D:set>
-<D:prop>
-<D:resourcetype><D:collection/><C:calendar/></D:resourcetype>
-</D:prop>
-</D:set>
-</D:propertyupdate>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/downgrade_collection/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/downgrade_collection/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
+<D:set>
+<D:prop>
+<D:resourcetype><D:collection/><C:calendar/></D:resourcetype>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcalendar/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/mkcalendar/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcalendar/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
-<D:set>
-<D:prop>
-<D:displayname>A Calendar</D:displayname>
-<C:calendar-description xml:lang="en">First CalDAV calendar.</C:calendar-description>
-<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
-</D:prop>
-</D:set>
-</C:mkcalendar>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcalendar/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/mkcalendar/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcalendar/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcalendar/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
+<D:set>
+<D:prop>
+<D:displayname>A Calendar</D:displayname>
+<C:calendar-description xml:lang="en">First CalDAV calendar.</C:calendar-description>
+<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
+</D:prop>
+</D:set>
+</C:mkcalendar>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcol/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/mkcol/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcol/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:mkcol xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
-<D:set>
-<D:prop>
-<D:displayname>A Calendar</D:displayname>
-<C:calendar-description xml:lang="en">First CalDAV calendar.</C:calendar-description>
-<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
-</D:prop>
-</D:set>
-</D:mkcol>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcol/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/mkcol/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcol/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/mkcol/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:mkcol xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
+<D:set>
+<D:prop>
+<D:displayname>A Calendar</D:displayname>
+<C:calendar-description xml:lang="en">First CalDAV calendar.</C:calendar-description>
+<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
+</D:prop>
+</D:set>
+</D:mkcol>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/upgrade_collection/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/upgrade_collection/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/upgrade_collection/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
-<D:set>
-<D:prop>
-<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
-</D:prop>
-</D:set>
-</D:propertyupdate>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/feature/upgrade_collection/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/feature/upgrade_collection/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/feature/upgrade_collection/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/feature/upgrade_collection/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
+<D:set>
+<D:prop>
+<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-    <CS:set>
-        <D:href>mailto:user02 at example.com</D:href>
-        <CS:summary>My Shared Calendar</CS:summary>
-        <CS:read-write/>
-    </CS:set>
-</CS:share>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:set>
+        <D:href>mailto:user02 at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-notification shared-type='calendar'>
-    <uid></uid>
-    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-    <invite-noresponse/>
-    <access>
-      <read-write/>
-    </access>
-    <hosturl>
-      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-    </hosturl>
-    <organizer>
-      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
-    </organizer>
-    <summary>My Shared Calendar</summary>
-  </invite-notification>
-</notification>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+    <invite-noresponse/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+  </invite-notification>
+</notification>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-<D:prop>
-<CS:notification-type/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -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:notification-type/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/uninvitenew/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-    <CS:remove>
-        <D:href>mailto:user02 at example.com</D:href>
-        <CS:summary>My Shared Calendar</CS:summary>
-        <CS:read-write/>
-    </CS:remove>
-</CS:share>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/uninvitenew/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:remove>
+        <D:href>mailto:user02 at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:remove>
+</CS:share>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-    <CS:set>
-        <D:href>mailto:user02 at example.com</D:href>
-        <CS:summary>My Shared Calendar</CS:summary>
-        <CS:read/>
-    </CS:set>
-</CS:share>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:set>
+        <D:href>mailto:user02 at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read/>
+    </CS:set>
+</CS:share>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-notification shared-type='calendar'>
-    <uid></uid>
-    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-    <invite-noresponse/>
-    <access>
-      <read/>
-    </access>
-    <hosturl>
-      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-    </hosturl>
-    <organizer>
-      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
-    </organizer>
-    <summary>My Shared Calendar</summary>
-  </invite-notification>
-</notification>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+    <invite-noresponse/>
+    <access>
+      <read/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+  </invite-notification>
+</notification>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-<D:prop>
-<CS:notification-type/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -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:notification-type/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,55 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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-2
-DTSTART;TZID=US/Eastern:20060101T080000
-DURATION:PT1H
-RRULE:FREQ=DAILY;COUNT=10
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT30M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060102T080000
-DTSTART;TZID=US/Eastern:20060102T080000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-TRANSP:TRANSPARENT
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,55 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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-2
+DTSTART;TZID=US/Eastern:20060101T080000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=10
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT30M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid-2
+RECURRENCE-ID;TZID=US/Eastern:20060102T080000
+DTSTART;TZID=US/Eastern:20060102T080000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid-2
+RECURRENCE-ID;TZID=US/Eastern:20060103T080000
+DTSTART;TZID=US/Eastern:20060103T090000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,56 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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-2
-DTSTART;TZID=US/Eastern:20060101T080000
-DURATION:PT1H
-RRULE:FREQ=DAILY;COUNT=10
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060102T080000
-DTSTART;TZID=US/Eastern:20060102T080000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-TRANSP:TRANSPARENT
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT20M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,56 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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-2
+DTSTART;TZID=US/Eastern:20060101T080000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=10
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid-2
+RECURRENCE-ID;TZID=US/Eastern:20060103T080000
+DTSTART;TZID=US/Eastern:20060103T090000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid-2
+RECURRENCE-ID;TZID=US/Eastern:20060102T080000
+DTSTART;TZID=US/Eastern:20060102T080000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+TRANSP:TRANSPARENT
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT20M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,38 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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-2
-DTSTART;TZID=US/Eastern:20060101T080000
-DURATION:PT1H
-RRULE:FREQ=DAILY;COUNT=10
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,38 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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-2
+DTSTART;TZID=US/Eastern:20060101T080000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=10
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid-2
+RECURRENCE-ID;TZID=US/Eastern:20060103T080000
+DTSTART;TZID=US/Eastern:20060103T090000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,56 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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-2
-DTSTART;TZID=US/Eastern:20060101T080000
-DURATION:PT1H
-RRULE:FREQ=DAILY;COUNT=10
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060102T080000
-DTSTART;TZID=US/Eastern:20060102T080000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-TRANSP:TRANSPARENT
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT20M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,56 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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-2
+DTSTART;TZID=US/Eastern:20060101T080000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=10
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid-2
+RECURRENCE-ID;TZID=US/Eastern:20060102T080000
+DTSTART;TZID=US/Eastern:20060102T080000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+TRANSP:TRANSPARENT
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT20M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid-2
+RECURRENCE-ID;TZID=US/Eastern:20060103T080000
+DTSTART;TZID=US/Eastern:20060103T090000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,38 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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-2
-DTSTART;TZID=US/Eastern:20060101T080000
-DURATION:PT1H
-RRULE:FREQ=DAILY;COUNT=10
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-END:VEVENT
-BEGIN:VEVENT
-UID:user01-uid-2
-RECURRENCE-ID;TZID=US/Eastern:20060103T080000
-DTSTART;TZID=US/Eastern:20060103T090000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 2
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/complex-put/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,38 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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-2
+DTSTART;TZID=US/Eastern:20060101T080000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=10
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+END:VEVENT
+BEGIN:VEVENT
+UID:user01-uid-2
+RECURRENCE-ID;TZID=US/Eastern:20060103T080000
+DTSTART;TZID=US/Eastern:20060103T090000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 2
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,33 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:20060101T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1.1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT5M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,33 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:20060101T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1.1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT5M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,29 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:20060101T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1.1
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:20060101T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1.1
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,34 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:20060101T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1.2
-TRANSP:TRANSPARENT
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT15M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:20060101T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1.2
+TRANSP:TRANSPARENT
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,33 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:20060101T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1.2
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT5M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,33 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:20060101T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1.2
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT5M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,29 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:20060101T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1.2
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:20060101T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1.2
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,16 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VFREEBUSY
-UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username2::$cuaddr2:
-ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000Z
-DTSTAMP:20060309T185105Z
-DTEND:20060105T000000Z
-END:VFREEBUSY
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060105T000000Z
+END:VFREEBUSY
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,16 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VFREEBUSY
-UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=$username2::$cuaddr2:
-ATTENDEE;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username2::$cuaddr2:
-ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000Z
-DTSTAMP:20060309T185105Z
-DTEND:20060105T000000Z
-END:VFREEBUSY
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060105T000000Z
+END:VFREEBUSY
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,16 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VFREEBUSY
-UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=$username3::$cuaddr3:
-ATTENDEE;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username2::$cuaddr2:
-ATTENDEE;CN=$username3::$cuaddr3:
-DTSTART:20060101T000000Z
-DTSTAMP:20060309T185105Z
-DTEND:20060105T000000Z
-END:VFREEBUSY
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=$username3::$cuaddr3:
+ATTENDEE;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060105T000000Z
+END:VFREEBUSY
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,33 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:20060101T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/1.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,33 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:20060101T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,29 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-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:20060101T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 1
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/simple-put/2.ics	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+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:20060101T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:">
-<D:set>
-<D:prop>
-<D:displayname>Changed Name #1</D:displayname>
-</D:prop>
-</D:set>
-</D:propertyupdate>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:displayname>Changed Name #1</D:displayname>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:displayname/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:displayname/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:">
-<D:set>
-<D:prop>
-<D:displayname>Shared Name #2</D:displayname>
-</D:prop>
-</D:set>
-</D:propertyupdate>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:displayname>Shared Name #2</D:displayname>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-    <CS:set>
-        <D:href>mailto:user02 at example.com</D:href>
-        <CS:summary>My Shared Calendar</CS:summary>
-        <CS:read-write/>
-    </CS:set>
-</CS:share>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:set>
+        <D:href>mailto:user02 at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-notification shared-type='calendar'>
-    <uid></uid>
-    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-    <invite-noresponse/>
-    <access>
-      <read-write/>
-    </access>
-    <hosturl>
-      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-    </hosturl>
-    <organizer>
-      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
-    </organizer>
-    <summary>My Shared Calendar</summary>
-  </invite-notification>
-</notification>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+    <invite-noresponse/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+  </invite-notification>
+</notification>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<invite-reply xmlns='http://calendarserver.org/ns/'>
-  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-  <invite-accepted/>
-  <hosturl>
-    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-  </hosturl>
-  <in-reply-to>$inviteuid:</in-reply-to>
-  <summary>The Shared Calendar</summary>
-</invite-reply>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuid:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+</invite-reply>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/4.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/read-write/4.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:resourcetype/>
-<D:owner/>
-<D:current-user-privilege-set/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/4.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/read-write/4.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/4.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+<D:owner/>
+<D:current-user-privilege-set/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:set>
-<D:prop>
-<C:calendar-description>Description #1</C:calendar-description>
-</D:prop>
-</D:set>
-</D:propertyupdate>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+<C:calendar-description>Description #1</C:calendar-description>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<C:calendar-description/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<C:calendar-description/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:set>
-<D:prop>
-<C:calendar-description>Sharee Description #2</C:calendar-description>
-</D:prop>
-</D:set>
-</D:propertyupdate>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+<C:calendar-description>Sharee Description #2</C:calendar-description>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-    <CS:set>
-        <D:href>mailto:user02 at example.com</D:href>
-        <CS:summary>My Shared Calendar</CS:summary>
-        <CS:read-write/>
-    </CS:set>
-</CS:share>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:set>
+        <D:href>mailto:user02 at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-notification shared-type='calendar'>
-    <uid></uid>
-    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-    <invite-noresponse/>
-    <access>
-      <read-write/>
-    </access>
-    <hosturl>
-      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-    </hosturl>
-    <organizer>
-      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
-    </organizer>
-    <summary>My Shared Calendar</summary>
-  </invite-notification>
-</notification>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='calendar'>
+    <uid></uid>
+    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+    <invite-noresponse/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+    </organizer>
+    <summary>My Shared Calendar</summary>
+  </invite-notification>
+</notification>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<invite-reply xmlns='http://calendarserver.org/ns/'>
-  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-  <invite-accepted/>
-  <hosturl>
-    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-  </hosturl>
-  <in-reply-to>$inviteuid:</in-reply-to>
-  <summary>The Shared Calendar</summary>
-</invite-reply>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuid:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+</invite-reply>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/4.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/4.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-<D:prop>
-<CS:invite/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/4.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/4.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/4.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -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:invite/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/5.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
-  <response>
-    <href>/calendars/__uids__/user01/shared/</href>
-    <propstat>
-      <prop>
-        <invite xmlns='http://calendarserver.org/ns/'>
-          <user>
-            <uid></uid>
-            <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-            <access>
-              <read-write/>
-            </access>
-            <invite-accepted/>
-          </user>
-        </invite>
-      </prop>
-      <status>HTTP/1.1 200 OK</status>
-    </propstat>
-  </response>
-</multistatus>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/5.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
+  <response>
+    <href>/calendars/__uids__/user01/shared/</href>
+    <propstat>
+      <prop>
+        <invite xmlns='http://calendarserver.org/ns/'>
+          <user>
+            <uid></uid>
+            <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+            <access>
+              <read-write/>
+            </access>
+            <invite-accepted/>
+          </user>
+        </invite>
+      </prop>
+      <status>HTTP/1.1 200 OK</status>
+    </propstat>
+  </response>
+</multistatus>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/6.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
-    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-    <invite-accepted/>
-    <hosturl>
-      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-    </hosturl>
-    <in-reply-to>$inviteuid:</in-reply-to>
-    <summary>The Shared Calendar</summary>
-  </invite-reply>
-</notification>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/6.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-reply xmlns='http://calendarserver.org/ns/'>
+    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+    <invite-accepted/>
+    <hosturl>
+      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+    </hosturl>
+    <in-reply-to>$inviteuid:</in-reply-to>
+    <summary>The Shared Calendar</summary>
+  </invite-reply>
+</notification>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/7.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/7.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/7.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<shared-calendar xmlns='http://calendarserver.org/ns/'>
-  <href xmlns='DAV:'></href>
-</shared-calendar>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/7.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/7.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/7.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/7.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<shared-calendar xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'></href>
+</shared-calendar>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<invite-reply xmlns='http://calendarserver.org/ns/'>
-  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-  <invite-declined/>
-  <hosturl>
-    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-  </hosturl>
-  <in-reply-to>$inviteuid:</in-reply-to>
-  <summary>The Shared Calendar</summary>
-</invite-reply>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+  <invite-declined/>
+  <hosturl>
+    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuid:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+</invite-reply>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-<D:prop>
-<CS:invite/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -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:invite/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
-  <response>
-    <href>/calendars/__uids__/user01/shared/</href>
-    <propstat>
-      <prop>
-        <invite xmlns='http://calendarserver.org/ns/'>
-          <user>
-            <uid></uid>
-            <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-            <access>
-              <read-write/>
-            </access>
-            <invite-declined/>
-          </user>
-        </invite>
-      </prop>
-      <status>HTTP/1.1 200 OK</status>
-    </propstat>
-  </response>
-</multistatus>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
+  <response>
+    <href>/calendars/__uids__/user01/shared/</href>
+    <propstat>
+      <prop>
+        <invite xmlns='http://calendarserver.org/ns/'>
+          <user>
+            <uid></uid>
+            <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+            <access>
+              <read-write/>
+            </access>
+            <invite-declined/>
+          </user>
+        </invite>
+      </prop>
+      <status>HTTP/1.1 200 OK</status>
+    </propstat>
+  </response>
+</multistatus>

Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/4.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
-  <dtstamp></dtstamp>
-  <invite-reply xmlns='http://calendarserver.org/ns/'>
-    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-    <invite-declined/>
-    <hosturl>
-      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-    </hosturl>
-    <in-reply-to>$inviteuid:</in-reply-to>
-  </invite-reply>
-</notification>

Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/4.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-reply xmlns='http://calendarserver.org/ns/'>
+    <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+    <invite-declined/>
+    <hosturl>
+      <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+    </hosturl>
+    <in-reply-to>$inviteuid:</in-reply-to>
+  </invite-reply>
+</notification>

Deleted: CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/MKCALENDAR/sharedcalendar.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
-<D:set>
-<D:prop>
-<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
-</D:prop>
-</D:set>
-</C:mkcalendar>

Copied: CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/MKCALENDAR/sharedcalendar.xml)
===================================================================
--- CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"  xmlns:S="http://calendarserver.org/ns/">
+<D:set>
+<D:prop>
+<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
+</D:prop>
+</D:set>
+</C:mkcalendar>

Deleted: CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/POST/sharinginvite23.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
-    <CS:set>
-        <D:href>mailto:user02 at example.com</D:href>
-        <CS:summary>My Shared Calendar</CS:summary>
-        <CS:read-write/>
-    </CS:set>
-    <CS:set>
-        <D:href>mailto:user03 at example.com</D:href>
-        <CS:summary>My Shared Calendar</CS:summary>
-        <CS:read/>
-    </CS:set>
-</CS:share>

Copied: CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/POST/sharinginvite23.xml)
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:set>
+        <D:href>mailto:user02 at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+    <CS:set>
+        <D:href>mailto:user03 at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read/>
+    </CS:set>
+</CS:share>

Deleted: CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/POST/sharingreply2.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<invite-reply xmlns='http://calendarserver.org/ns/'>
-  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
-  <invite-accepted/>
-  <hosturl>
-    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-  </hosturl>
-  <in-reply-to>$inviteuid2:</in-reply-to>
-  <summary>The Shared Calendar</summary>
-</invite-reply>

Copied: CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/POST/sharingreply2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuid2:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+</invite-reply>

Deleted: CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/POST/sharingreply3.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<invite-reply xmlns='http://calendarserver.org/ns/'>
-  <href xmlns='DAV:'>/principals/__uids__/user03/</href>
-  <invite-accepted/>
-  <hosturl>
-    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
-  </hosturl>
-  <in-reply-to>$inviteuid3:</in-reply-to>
-  <summary>The Shared Calendar</summary>
-</invite-reply>

Copied: CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/POST/sharingreply3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>/principals/__uids__/user03/</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+  </hosturl>
+  <in-reply-to>$inviteuid3:</in-reply-to>
+  <summary>The Shared Calendar</summary>
+</invite-reply>

Deleted: CalDAVTester/trunk/Resource/Common/PROPFIND/count.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPFIND/count.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/Common/PROPFIND/count.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:resourcetype/>
-<D:getetag/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/Common/PROPFIND/count.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPFIND/count.xml)
===================================================================
--- CalDAVTester/trunk/Resource/Common/PROPFIND/count.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/PROPFIND/count.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+<D:getetag/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/Common/PROPFIND/resourcetype.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPFIND/resourcetype.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/Common/PROPFIND/resourcetype.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:resourcetype/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/Common/PROPFIND/resourcetype.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPFIND/resourcetype.xml)
===================================================================
--- CalDAVTester/trunk/Resource/Common/PROPFIND/resourcetype.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/PROPFIND/resourcetype.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/Common/PROPPATCH/calendar-transp-opaque.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPPATCH/calendar-transp-opaque.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/Resource/Common/PROPPATCH/calendar-transp-opaque.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:set>
-<D:prop>
-<C:schedule-calendar-transp><C:opaque/></C:schedule-calendar-transp>
-</D:prop>
-</D:set>
-</D:propertyupdate>

Copied: CalDAVTester/trunk/Resource/Common/PROPPATCH/calendar-transp-opaque.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPPATCH/calendar-transp-opaque.xml)
===================================================================
--- CalDAVTester/trunk/Resource/Common/PROPPATCH/calendar-transp-opaque.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/PROPPATCH/calendar-transp-opaque.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+<C:schedule-calendar-transp><C:opaque/></C:schedule-calendar-transp>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-carddav.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-carddav.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/server/serverinfo-carddav.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -27,6 +27,7 @@
 		<!--  Generic WebDAV extensions -->
 		<feature>COPY Method</feature>							<!-- COPY method -->
 		<feature>MOVE Method</feature>							<!-- MOVE method -->
+		<feature>Extended MKCOL</feature>						<!-- Extended MKCOL -->
 		
 		<!-- ACL related -->
 		<feature>ACL Method</feature>							<!-- ACL method -->
@@ -58,6 +59,7 @@
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
 		<feature>proxy-authz</feature>					<!-- sudo user extension -->
 		<feature>schedule-changes</feature>				<!-- schedule-changes property extension -->
+		<feature>shared-calendars</feature>				<!-- Shared calendars extension -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 
@@ -180,6 +182,12 @@
 			<value>dropbox</value>
 		</substitution>
 
+		<!-- notification name-->
+		<substitution>
+			<key>$notification:</key>
+			<value>notification</value>
+		</substitution>
+
 		<!-- freebusy name-->
 		<substitution>
 			<key>$freebusy:</key>
@@ -354,6 +362,11 @@
 				<key>$dropboxpath%d:</key>
 				<value>$calendars_uids:$userguid%d:/$dropbox:</value>
 			</substitution>
+			<!-- relative path to user notification-->
+			<substitution>
+				<key>$notificationpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$notification:</value>
+			</substitution>
 			<!-- relative path to user freebusy-->
 			<substitution>
 				<key>$freebusypath%d:</key>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -27,6 +27,7 @@
 		<!--  Generic WebDAV extensions -->
 		<feature>COPY Method</feature>							<!-- COPY method -->
 		<feature>MOVE Method</feature>							<!-- MOVE method -->
+		<feature>Extended MKCOL</feature>						<!-- Extended MKCOL -->
 		
 		<!-- ACL related -->
 		<feature>ACL Method</feature>							<!-- ACL method -->
@@ -58,6 +59,7 @@
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
 		<feature>proxy-authz</feature>					<!-- sudo user extension -->
 		<feature>schedule-changes</feature>				<!-- schedule-changes property extension -->
+		<feature>shared-calendars</feature>				<!-- Shared calendars extension -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 
@@ -180,6 +182,12 @@
 			<value>dropbox</value>
 		</substitution>
 
+		<!-- notification name-->
+		<substitution>
+			<key>$notification:</key>
+			<value>notification</value>
+		</substitution>
+
 		<!-- freebusy name-->
 		<substitution>
 			<key>$freebusy:</key>
@@ -354,6 +362,11 @@
 				<key>$dropboxpath%d:</key>
 				<value>$calendars_uids:$userguid%d:/$dropbox:</value>
 			</substitution>
+			<!-- relative path to user notification-->
+			<substitution>
+				<key>$notificationpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$notification:</value>
+			</substitution>
 			<!-- relative path to user freebusy-->
 			<substitution>
 				<key>$freebusypath%d:</key>

Copied: CalDAVTester/trunk/scripts/server/serverinfo-sun.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/server/serverinfo-sun.xml)
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-sun.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/server/serverinfo-sun.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,636 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE serverinfo SYSTEM "serverinfo.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<serverinfo>
+	<host>128.195.52.43</host>
+	<port>8080</port>
+	<authtype>basic</authtype>
+
+	<features>
+		<!--  Generic WebDAV extensions -->
+		<!-- <feature>COPY Method</feature> -->					<!-- COPY method -->
+		<!-- <feature>MOVE Method</feature> -->					<!-- MOVE method -->
+		
+		<!-- ACL related -->
+		<!-- <feature>ACL Method</feature> -->					<!-- ACL method -->
+		<!-- <feature>acl-principal-prop-set REPORT</feature> --><!-- ACL acl-principal-prop-set REPORT -->
+		<feature>principal-match REPORT</feature>				<!-- ACL principal-match REPORT -->
+		<feature>principal-property-search REPORT</feature>		<!-- ACL principal-property-search REPORT -->
+		<feature>principal-search-property-set REPORT</feature>	<!-- ACL principal-search-property-set REPORT -->
+
+		<!-- <feature>add-member</feature> -->			<!-- Add-member used to create resources -->
+		<feature>ctag</feature>							<!-- ctag extension -->
+		<feature>current-user-principal</feature>		<!-- current-user-principal extension -->
+		<!-- <feature>directory listing</feature> -->	<!-- GET on collection -->
+		<!-- <feature>extended-principal-search</feature> --><!-- Extended principal-property-search REPORT extension -->
+		<!-- <feature>expand-property</feature> -->		<!-- Expand property REPORT -->
+		<feature>quota</feature>						<!-- WebDAV QUOTA -->
+		<feature>sync-report</feature>					<!-- WebDAV collection sync REPORT -->
+		<!-- <feature>well-known</feature> -->			<!-- well-known feature -->
+
+		<!-- CalDAV specific extension -->
+		<feature>caldav</feature>					    <!-- Basic CalDAV feature enabler -->
+		<!-- <feature>auto-accept</feature> -->			<!-- Auto-accept for rooms & locations -->
+		<!-- <feature>dropbox</feature> -->				<!-- dropbox extension -->
+		<!-- <feature>EMAIL parameter</feature> -->		<!-- Server normalizes cuaddress and adds EMAIL parameter -->
+		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
+		<!-- <feature>maskuid</feature> -->				<!-- maskuid extension -->
+		<!-- <feature>partitioning</feature> -->		<!-- Partitioned server -->
+		<!-- <feature>private-comments</feature> -->	<!-- private-comments extension -->
+		<!-- <feature>private-events</feature> -->		<!-- private-events extension -->
+		<!-- <feature>proxy</feature> -->				<!-- calendar-user-proxy extension -->
+		<!-- <feature>proxy-authz</feature> -->			<!-- sudo user extension -->
+		<!-- <feature>schedule-changes</feature> -->	<!-- schedule-changes property extension -->
+		<!-- <feature>timezone-service</feature> -->	<!-- Timezone service extension -->
+		<!-- <feature>vavailability</feature> -->		<!-- VAVAILABILITY on inbox -->
+
+		<!-- CardDAV specific extension -->
+		<!-- <feature>carddav</feature> -->				<!-- Basic CardDAV feature enabler -->
+
+	</features>
+
+	<substitutions>
+		<substitution>
+			<key>$host:</key>
+			<value>http://128.195.52.43:8080</value>
+		</substitution>
+
+		<!-- relative path to caldav root-->
+		<substitution>
+			<key>$root:</key>
+			<value>/davserver/dav/</value>
+		</substitution>
+
+		<!-- relative path to main principal collection-->
+		<substitution>
+			<key>$principalcollection:</key>
+			<value>$root:principals/</value>
+		</substitution>
+
+		<!-- the core recored type collections-->
+		<substitution>
+			<key>$uidstype:</key>
+			<value></value>
+		</substitution>
+		<substitution>
+			<key>$userstype:</key>
+			<value></value>
+		</substitution>
+		<substitution>
+			<key>$groupstype:</key>
+			<value></value>
+		</substitution>
+		<substitution>
+			<key>$locationstype:</key>
+			<value></value>
+		</substitution>
+		<substitution>
+			<key>$resourcestype:</key>
+			<value></value>
+		</substitution>
+
+		<!-- relative path to record type principal collections-->
+		<substitution>
+			<key>$principals_uids:</key>
+			<value>$principalcollection:</value>
+		</substitution>
+		<substitution>
+			<key>$principals_users:</key>
+			<value>$principalcollection:</value>
+		</substitution>
+		<substitution>
+			<key>$principals_groups:</key>
+			<value>$principalcollection:</value>
+		</substitution>
+		<substitution>
+			<key>$principals_resources:</key>
+			<value>$principalcollection:</value>
+		</substitution>
+		<substitution>
+			<key>$principals_locations:</key>
+			<value>$principalcollection:</value>
+		</substitution>
+
+		<!-- relative path to calendars collection-->
+		<substitution>
+			<key>$calendars:</key>
+			<value>$root:home/</value>
+		</substitution>
+
+		<!-- relative path to record type calendar collections-->
+		<substitution>
+			<key>$calendars_uids:</key>
+			<value>$calendars:</value>
+		</substitution>
+		<substitution>
+			<key>$calendars_users:</key>
+			<value>$calendars:</value>
+		</substitution>
+		<substitution>
+			<key>$calendars_groups:</key>
+			<value>$calendars:</value>
+		</substitution>
+		<substitution>
+			<key>$calendars_resources:</key>
+			<value>$calendars:</value>
+		</substitution>
+		<substitution>
+			<key>$calendars_locations:</key>
+			<value>$calendars:</value>
+		</substitution>
+
+		<!-- primary calendar name-->
+		<substitution>
+			<key>$calendar:</key>
+			<value>calendar</value>
+		</substitution>
+
+		<!-- inbox name-->
+		<substitution>
+			<key>$inbox:</key>
+			<value>calendar-inbox</value>
+		</substitution>
+
+		<!-- outbox name-->
+		<substitution>
+			<key>$outbox:</key>
+			<value>calendar-outbox</value>
+		</substitution>
+
+		<!-- dropbox name-->
+		<substitution>
+			<key>$dropbox:</key>
+			<value>dropbox</value>
+		</substitution>
+
+		<!-- freebusy name-->
+		<substitution>
+			<key>$freebusy:</key>
+			<value>freebusy</value>
+		</substitution>
+
+		<!-- server-to-server inbox-->
+		<substitution>
+			<key>$servertoserver:</key>
+			<value>$root:inbox</value>
+		</substitution>
+
+		<!-- timezone service-->
+		<substitution>
+			<key>$timezoneservice:</key>
+			<value>$root:timezones</value>
+		</substitution>
+
+		<!-- relative path to calendars collection-->
+		<substitution>
+			<key>$addressbooks:</key>
+			<value>$root:addressbooks/</value>
+		</substitution>
+
+		<!-- relative path to record type calendar collections-->
+		<substitution>
+			<key>$addressbooks_uids:</key>
+			<value>$addressbooks:</value>
+		</substitution>
+		<substitution>
+			<key>$addressbooks_users:</key>
+			<value>$addressbooks:</value>
+		</substitution>
+		<substitution>
+			<key>$addressbooks_groups:</key>
+			<value>$addressbooks:</value>
+		</substitution>
+
+		<!-- primary calendar name-->
+		<substitution>
+			<key>$addressbook:</key>
+			<value>addressbook</value>
+		</substitution>
+
+		<!-- directory name-->
+		<substitution>
+			<key>$directory:</key>
+			<value>$root:directory/</value>
+		</substitution>
+
+		<!-- user id for admin user -->
+		<substitution>
+			<key>$useradmin:</key>
+			<value>admin</value>
+		</substitution>
+		<!-- guid for admin user -->
+		<substitution>
+			<key>$useradminguid:</key>
+			<value>admin</value>
+		</substitution>
+		<!-- password for admin user -->
+		<substitution>
+			<key>$pswdadmin:</key>
+			<value>admin</value>
+		</substitution>
+
+		<!-- relative path to admin principal resource-->
+		<substitution>
+			<key>$principal_admin:</key>
+			<value>$principals_users:$useradmin:/</value>
+		</substitution>
+		<substitution>
+			<key>$principaluri_admin:</key>
+			<value>$principals_uids:$useradminguid:/</value>
+		</substitution>
+
+		<!-- user id for apprentice user -->
+		<substitution>
+			<key>$userapprentice:</key>
+			<value>apprentice</value>
+		</substitution>
+		<!-- guid for apprentice user -->
+		<substitution>
+			<key>$userapprenticeguid:</key>
+			<value>apprentice</value>
+		</substitution>
+		<!-- password for admin user -->
+		<substitution>
+			<key>$pswdapprentice:</key>
+			<value>apprentice</value>
+		</substitution>
+
+		<!-- relative path to apprentice principal resource-->
+		<substitution>
+			<key>$principal_apprentice:</key>
+			<value>$principals_users:$userapprentice:/</value>
+		</substitution>
+		<substitution>
+			<key>$principaluri_apprentice:</key>
+			<value>$principals_uids:$userapprenticeguid:/</value>
+		</substitution>
+
+		<!-- user id for proxy user -->
+		<substitution>
+			<key>$userproxy:</key>
+			<value>superuser</value>
+		</substitution>
+		<!-- password for proxy user -->
+		<substitution>
+			<key>$pswdproxy:</key>
+			<value>superuser</value>
+		</substitution>
+
+		<!--  Ten user accounts -->
+		<repeat count="10">
+			<!-- user id -->
+			<substitution>
+				<key>$userid%d:</key>
+				<value>caluser%d</value>
+			</substitution>
+			<!-- user guid -->
+			<substitution>
+				<key>$userguid%d:</key>
+				<value>caluser%d</value>
+			</substitution>
+			<!-- user name -->
+			<substitution>
+				<key>$username%d:</key>
+				<value>User %d</value>
+			</substitution>
+			<!-- password -->
+			<substitution>
+				<key>$pswd%d:</key>
+				<value>secret</value>
+			</substitution>
+			<!-- relative path to user principal resource-->
+			<substitution>
+				<key>$principal%d:</key>
+				<value>$principals_users:$userid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$principaluri%d:</key>
+				<value>$principals_uids:$userguid%d:@Sun.COM/</value>
+			</substitution>
+			<substitution>
+				<key>$principal%dnoslash:</key>
+				<value>$principals_users:$userid%d:@Sun.COM</value>
+			</substitution>
+
+			<!-- relative path to user calendar home-->
+			<substitution>
+				<key>$pathprefix%d:</key>
+				<value>$calendars_uids:$userguid%d:</value>
+			</substitution>
+			<!-- relative path to user calendar-->
+			<substitution>
+				<key>$calendarpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to user inbox-->
+			<substitution>
+				<key>$inboxpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to user outbox-->
+			<substitution>
+				<key>$outboxpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to user dropbox-->
+			<substitution>
+				<key>$dropboxpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$dropbox:</value>
+			</substitution>
+			<!-- relative path to user freebusy-->
+			<substitution>
+				<key>$freebusypath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$freebusy:</value>
+			</substitution>
+			<!-- relative path to user alternate calendar home-->
+			<substitution>
+				<key>$pathprefixalt%d:</key>
+				<value>$calendars_users:$userid%d:</value>
+			</substitution>
+			<!-- relative path to user alternate calendar-->
+			<substitution>
+				<key>$calendarpathalt%d:</key>
+				<value>$calendars_users:$userid%d:/$calendar:</value>
+			</substitution>
+			<substitution>
+				<key>$email%d:</key>
+				<value>$userid%d:@Sun.COM</value>
+			</substitution>
+			<!-- calendar user address of user-->
+			<substitution>
+				<key>$cuaddr%d:</key>
+				<value>MAILTO:$email%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddralt%d:</key>
+				<value>$principaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddraltnoslash%d:</key>
+				<value>$principals_uids:$userguid%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddrurn%d:</key>
+				<value>MAILTO:$email%d:</value>
+			</substitution>
+
+			<!-- relative path to user addressbook home-->
+			<substitution>
+				<key>$addressbookhome%d:</key>
+				<value>$addressbooks_uids:$userguid%d:</value>
+			</substitution>
+			<!-- relative path to user addressbook-->
+			<substitution>
+				<key>$addressbookpath%d:</key>
+				<value>$addressbooks_uids:$userguid%d:/$addressbook:</value>
+			</substitution>
+		</repeat>
+
+		<!--  Ten public accounts -->
+		<repeat count="10">
+			<!-- user id -->
+			<substitution>
+				<key>$publicuserid%d:</key>
+				<value>public%02d</value>
+			</substitution>
+			<!-- user guid -->
+			<substitution>
+				<key>$publicuserguid%d:</key>
+				<value>public%02d</value>
+			</substitution>
+			<!-- user name -->
+			<substitution>
+				<key>$publicusername%d:</key>
+				<value>Public %02d</value>
+			</substitution>
+			<!-- password -->
+			<substitution>
+				<key>$publicpswd%d:</key>
+				<value>public%02d</value>
+			</substitution>
+			<!-- relative path to user principal resource-->
+			<substitution>
+				<key>$publicprincipal%d:</key>
+				<value>$principals_users:$publicuserid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$publicprincipaluri%d:</key>
+				<value>$principals_uids:$publicuserguid%d:/</value>
+			</substitution>
+			<!-- relative path to user calendar home-->
+			<substitution>
+				<key>$publicpathprefix%d:</key>
+				<value>$calendars_uids:$publicuserguid%d:</value>
+			</substitution>
+			<!-- relative path to user calendar-->
+			<substitution>
+				<key>$publiccalendarpath%d:</key>
+				<value>$calendars_uids:$publicuserguid%d:/$calendar:</value>
+			</substitution>
+			<substitution>
+				<key>$publicemail%d:</key>
+				<value>$publicuserid%d:@Sun.COM</value>
+			</substitution>
+			<!-- calendar user address of user-->
+			<substitution>
+				<key>$publiccuaddr%d:</key>
+				<value>mailto:$publicemail%d:</value>
+			</substitution>
+			<substitution>
+				<key>$publiccuaddralt%d:</key>
+				<value>$publicprincipaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$publiccuaddrurn%d:</key>
+				<value>urn:uuid:$publicuserguid%d:</value>
+			</substitution>
+		</repeat>
+
+		<!--  Ten resource accounts -->
+		<repeat count="10">
+			<substitution>
+				<key>$resourceid%d:</key>
+				<value>resource%02d</value>
+			</substitution>
+			<!-- resource guid-->
+			<substitution>
+				<key>$resourceguid%d:</key>
+				<value>resource%02d</value>
+			</substitution>
+			<!-- resource name-->
+			<substitution>
+				<key>$resourcename%d:</key>
+				<value>Resource %02d</value>
+			</substitution>
+			<!-- relative path to first resource calendar home-->
+			<substitution>
+				<key>$rpathprefix%d:</key>
+				<value>$calendars_uids:$resourceguid%d:</value>
+			</substitution>
+			<!-- relative path to first resource calendar home-->
+			<substitution>
+				<key>$rcalendarpath%d:</key>
+				<value>$calendars_uids:$resourceguid%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to first resource inbox-->
+			<substitution>
+				<key>$rinboxpath%d:</key>
+				<value>$calendars_uids:$resourceguid%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to first resource outbox-->
+			<substitution>
+				<key>$routboxpath%d:</key>
+				<value>$calendars_uids:$resourceguid%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to first resource principal resource-->
+			<substitution>
+				<key>$rprincipal%d:</key>
+				<value>$principals_resources:$resourceid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$rprincipaluri%d:</key>
+				<value>$principals_uids:$resourceguid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$rcuaddralt%d:</key>
+				<value>$rprincipaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$rcuaddrurn%d:</key>
+				<value>urn:uuid:$resourceguid%d:</value>
+			</substitution>
+		</repeat>
+
+		<!--  Ten Location accounts -->
+		<repeat count="10">
+			<substitution>
+				<key>$locationid%d:</key>
+				<value>location%02d</value>
+			</substitution>
+			<!-- location guid-->
+			<substitution>
+				<key>$locationguid%d:</key>
+				<value>location%02d</value>
+			</substitution>
+			<!-- location name-->
+			<substitution>
+				<key>$locationname%d:</key>
+				<value>Location %02d</value>
+			</substitution>
+			<!-- relative path to first location calendar home-->
+			<substitution>
+				<key>$lpathprefix%d:</key>
+				<value>$calendars_uids:$locationguid%d:</value>
+			</substitution>
+			<!-- relative path to first location calendar home-->
+			<substitution>
+				<key>$lcalendarpath%d:</key>
+				<value>$calendars_uids:$locationguid%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to first location inbox-->
+			<substitution>
+				<key>$linboxpath%d:</key>
+				<value>$calendars_uids:$locationguid%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to first location outbox-->
+			<substitution>
+				<key>$loutboxpath%d:</key>
+				<value>$calendars_uids:$locationguid%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to first location principal resource-->
+			<substitution>
+				<key>$lprincipal%d:</key>
+				<value>$principals_resources:$locationid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$lprincipaluri%d:</key>
+				<value>$principals_uids:$locationguid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$lcuaddralt%d:</key>
+				<value>$lprincipaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$lcuaddrurn%d:</key>
+				<value>urn:uuid:$locationguid%d:</value>
+			</substitution>
+		</repeat>
+
+
+		<!--  Four Group accounts -->
+		<repeat count="4">
+			<substitution>
+				<key>$groupid%d:</key>
+				<value>group%02d</value>
+			</substitution>
+			<!-- group guid-->
+			<substitution>
+				<key>$groupguid%d:</key>
+				<value>group%02d</value>
+			</substitution>
+			<!-- group name-->
+			<substitution>
+				<key>$groupname%d:</key>
+				<value>Group %02d</value>
+			</substitution>
+			<!-- relative path to first group principal resource-->
+			<substitution>
+				<key>$gprincipal%d:</key>
+				<value>$principals_resources:$groupid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$gprincipaluri%d:</key>
+				<value>$principals_uids:$groupguid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$gcuaddralt%d:</key>
+				<value>$gprincipaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$gcuaddrurn%d:</key>
+				<value>urn:uuid:$groupguid%d:</value>
+			</substitution>
+		</repeat>
+
+		<!-- relative path to disabled group principal resource-->
+		<substitution>
+			<key>$principaldisabled:</key>
+			<value>$principals_groups:disabledgroup/</value>
+		</substitution>
+		<substitution>
+			<key>$principaluridisabled:</key>
+			<value>$principals_uids:disabledgroup/</value>
+		</substitution>
+		<!-- calendar user address of disabled group-->
+		<substitution>
+			<key>$cuaddrdisabled:</key>
+			<value>$principals_uids:disabledgroup/</value>
+		</substitution>
+
+		<!--  Override some of the above definitions for special cases -->
+
+		<!-- calendar user address of second user-->
+		<substitution>
+			<key>$cuaddr2:</key>
+			<value>MAILTO:$email2:</value>
+		</substitution>
+
+	</substitutions>
+</serverinfo>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -27,6 +27,7 @@
 		<!--  Generic WebDAV extensions -->
 		<feature>COPY Method</feature>							<!-- COPY method -->
 		<feature>MOVE Method</feature>							<!-- MOVE method -->
+		<feature>Extended MKCOL</feature>						<!-- Extended MKCOL -->
 		
 		<!-- ACL related -->
 		<feature>ACL Method</feature>							<!-- ACL method -->
@@ -58,6 +59,7 @@
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
 		<feature>proxy-authz</feature>					<!-- sudo user extension -->
 		<feature>schedule-changes</feature>				<!-- schedule-changes property extension -->
+		<feature>shared-calendars</feature>				<!-- Shared calendars extension -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 
@@ -180,6 +182,12 @@
 			<value>dropbox</value>
 		</substitution>
 
+		<!-- notification name-->
+		<substitution>
+			<key>$notification:</key>
+			<value>notification</value>
+		</substitution>
+
 		<!-- freebusy name-->
 		<substitution>
 			<key>$freebusy:</key>
@@ -358,6 +366,11 @@
 				<key>$dropboxpath%%d:</key>
 				<value>$calendars_uids:$userguid%%d:/$dropbox:</value>
 			</substitution>
+			<!-- relative path to user notification-->
+			<substitution>
+				<key>$notificationpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$notification:</value>
+			</substitution>
 			<!-- relative path to user freebusy-->
 			<substitution>
 				<key>$freebusypath%%d:</key>

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -27,6 +27,7 @@
 		<!--  Generic WebDAV extensions -->
 		<feature>COPY Method</feature>							<!-- COPY method -->
 		<feature>MOVE Method</feature>							<!-- MOVE method -->
+		<feature>Extended MKCOL</feature>						<!-- Extended MKCOL -->
 		
 		<!-- ACL related -->
 		<feature>ACL Method</feature>							<!-- ACL method -->
@@ -57,6 +58,7 @@
 		<feature>private-events</feature>				<!-- private-events extension -->
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
 		<feature>proxy-authz</feature>					<!-- sudo user extension -->
+		<feature>shared-calendars</feature>				<!-- Shared calendars extension -->
 		<feature>schedule-changes</feature>				<!-- schedule-changes property extension -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
@@ -180,6 +182,12 @@
 			<value>dropbox</value>
 		</substitution>
 
+		<!-- notification name-->
+		<substitution>
+			<key>$notification:</key>
+			<value>notification</value>
+		</substitution>
+
 		<!-- freebusy name-->
 		<substitution>
 			<key>$freebusy:</key>
@@ -354,6 +362,11 @@
 				<key>$dropboxpath%d:</key>
 				<value>$calendars_uids:$userguid%d:/$dropbox:</value>
 			</substitution>
+			<!-- relative path to user notification-->
+			<substitution>
+				<key>$notificationpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$notification:</value>
+			</substitution>
 			<!-- relative path to user freebusy-->
 			<substitution>
 				<key>$freebusypath%d:</key>

Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -28,6 +28,7 @@
 		<!--  Generic WebDAV extensions -->
 		<feature>COPY Method</feature>							<!-- COPY method -->
 		<feature>MOVE Method</feature>							<!-- MOVE method -->
+		<feature>Extended MKCOL</feature>						<!-- Extended MKCOL -->
 		
 		<!-- ACL related -->
 		<feature>ACL Method</feature>							<!-- ACL method -->
@@ -59,6 +60,7 @@
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
 		<feature>proxy-authz</feature>					<!-- sudo user extension -->
 		<feature>schedule-changes</feature>				<!-- schedule-changes property extension -->
+		<feature>shared-calendars</feature>				<!-- Shared calendars extension -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 
@@ -181,6 +183,12 @@
 			<value>dropbox</value>
 		</substitution>
 
+		<!-- notification name-->
+		<substitution>
+			<key>$notification:</key>
+			<value>notification</value>
+		</substitution>
+
 		<!-- freebusy name-->
 		<substitution>
 			<key>$freebusy:</key>
@@ -355,6 +363,11 @@
 				<key>$dropboxpath%d:</key>
 				<value>$calendars_uids:$userguid%d:/$dropbox:</value>
 			</substitution>
+			<!-- relative path to user notification-->
+			<substitution>
+				<key>$notificationpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$notification:</value>
+			</substitution>
 			<!-- relative path to user freebusy-->
 			<substitution>
 				<key>$freebusypath%d:</key>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -45,15 +45,11 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
-					<callback>dataString</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
-						<name>contains</name>
-						<value>ATTACH;FMTTYPE=image/jpeg;ENCODING=BASE64;VALUE=BINARY:</value>
+						<name>filepath</name>
+						<value>Resource/CalDAV/attachments/1.ics</value>
 					</arg>
-					<arg>
-						<name>contains</name>
-						<value>RQAUUUUAFFFFAH//2Q==</value>
-					</arg>
 				</verify>
 			</request>
 		</test>
@@ -74,15 +70,11 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
-					<callback>dataString</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
-						<name>contains</name>
-						<value>ATTACH;FMTTYPE=image/jpeg;ENCODING=BASE64;VALUE=BINARY:</value>
+						<name>filepath</name>
+						<value>Resource/CalDAV/attachments/2.ics</value>
 					</arg>
-					<arg>
-						<name>contains</name>
-						<value>RQAUUUUAFFFFAH//2Q==</value>
-					</arg>
 				</verify>
 			</request>
 		</test>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -54,7 +54,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/delete/1.txt</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -77,8 +77,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -220,12 +220,12 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
-			<description>Two items in user01 Inbox</description>
+			<description>One items in user01 Inbox</description>
 			<request print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
@@ -356,8 +356,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -492,8 +492,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -628,8 +628,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -764,8 +764,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -900,8 +900,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -57,8 +57,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -157,8 +157,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -257,8 +257,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -357,8 +357,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -557,8 +557,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>


Property changes on: CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/implicitoptions.xml:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/implicitoptions.xml:3534-3558
   + /CalDAVTester/branches/users/cdaboo/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

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -44,7 +44,7 @@
 					<callback>header</callback>
 					<arg>
 						<name>header</name>
-						<value>ETag$\"08eb5966e4065cbadcb41da00bfae5f1\"</value>
+						<value>ETag</value>
 					</arg>
 				</verify>
 			</request>
@@ -52,7 +52,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/recurrenceput/1.txt</value>
@@ -77,7 +77,7 @@
 				<method>GET</method>
 				<ruri>$pathprefix1:/1.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/recurrenceput/1.txt</value>
@@ -105,7 +105,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/1todo.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/todo/1.txt</value>
@@ -130,7 +130,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/2todo.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/todo/2.txt</value>
@@ -155,7 +155,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/3todo.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/todo/3.txt</value>
@@ -180,7 +180,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/4todo.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/todo/4.txt</value>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -330,8 +330,8 @@
 					<arg>
 						<name>okprops</name>
 						<value>DAV:resourcetype</value>
-						<value>DAV:quota-available-bytes$104857000</value>
-						<value>DAV:quota-used-bytes$600</value>
+						<value>DAV:quota-available-bytes$104856758</value>
+						<value>DAV:quota-used-bytes$842</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -130,7 +130,7 @@
 					<callback>statusCode</callback>
 					<arg>
 						<name>status</name>
-						<value>405</value>
+						<value>403</value>
 					</arg>
 				</verify>
 			</request>

Copied: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-calendars.xml)
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,411 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test calendar sharing calendars</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>shared-calendars</feature>
+	</require-feature>
+
+	<start>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath1:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath2:/</ruri>
+		</request>
+		<request end-delete="yes">
+			<method>MKCALENDAR</method>
+			<ruri>$pathprefix1:/shared/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
+			</data>
+			<verify>
+				<callback>statusCode</callback>
+			</verify>
+		</request>
+	</start>
+	
+	<test-suite name='Read-write calendar'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-write/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/calendars/read-write/2.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+					<variable>$inviteuid:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Sharee replies ACCEPTED</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix2:/</ruri>
+				<data substitutions='yes'>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-write/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<grabelement>
+					<name>{DAV:}href</name>
+					<variable>$sharedcalendar:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Shared calendar exists</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-write/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value>DAV:resourcetype$.*shared[^-].*</value>
+						<value><![CDATA[DAV:owner$<href>/principals/__uids__/user01/</href>]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set$.*<read/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set$.*<write/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set$.*<bind/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set$.*<unbind/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set!.*admin.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set!.*all.*]]></value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Sharee creates event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$sharedcalendar:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-write/5.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>Sharer sees event</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$pathprefix1:/shared/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/calendars/read-write/5.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>Sharer changes event</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$pathprefix1:/shared/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-write/6.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Sharee sees changed event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$sharedcalendar:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/calendars/read-write/6.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='9'>
+			<description>Sharer creates event</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$pathprefix1:/shared/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-write/7.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='10'>
+			<description>Sharee sees new event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$sharedcalendar:/2.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/calendars/read-write/7.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='11'>
+			<description>Sharee changes event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$sharedcalendar:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-write/8.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='12'>
+			<description>Sharer sees changed event</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$pathprefix1:/shared/2.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/calendars/read-write/8.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Change to read-only calendar' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-only/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/calendars/read-only/2.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+					<variable>$inviteuid:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Sharee replies ACCEPTED</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix2:/</ruri>
+				<data substitutions='yes'>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-only/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<grabelement>
+					<name>{DAV:}href</name>
+					<variable>$sharedcalendar:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Shared calendar exists</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-only/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value>DAV:resourcetype$.*shared[^-].*</value>
+						<value><![CDATA[DAV:owner$<href>/principals/__uids__/user01/</href>]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set$.*<read/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set!.*<write/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set!.*<bind/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set!.*<unbind/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set!.*admin.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set!.*all.*]]></value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Create event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$sharedcalendar:/3.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-only/5.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>Sharer creates event</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$pathprefix1:/shared/4.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-only/6.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>Sharee sees new event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$sharedcalendar:/4.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/calendars/read-only/6.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Sharee canoot change event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$sharedcalendar:/4.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/calendars/read-write/8.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>

Copied: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-create.xml)
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,161 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest ignore-all='yes'>
+	<description>Test calendar sharing replies</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>shared-calendars</feature>
+	</require-feature>
+
+	<start/>
+	
+	<test-suite name='Create calendar' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request end-delete="no">
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	<test-suite name='Generate invite' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/replies/accept/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/replies/accept/2.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+					<variable>$inviteuid:</variable>
+				</grabelement>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Accept' ignore='no'>
+		<test name='1'>
+			<description>Sharee replies ACCEPTED</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<grabelement>
+					<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+					<variable>$inviteuid:</variable>
+				</grabelement>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix2:/</ruri>
+				<data substitutions='yes'>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/replies/accept/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check accept status</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/replies/accept/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Check Sharer notification collection</description>
+			<request>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath1:/</ruri>
+			</request>
+			<request print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath1:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/replies/accept/6.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>

Copied: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-feature.xml)
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,295 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test calendar sharing</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>shared-calendars</feature>
+	</require-feature>
+
+	<start/>
+	
+	<test-suite name='OPTIONS header' ignore='no'>
+		<test name='1'>
+			<description>Look for options header tag on principal</description>
+			<request print-response="no">
+				<method>OPTIONS</method>
+				<ruri>$principal1:</ruri>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>*DAV$.*calendarserver-sharing.*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Look for options header tag on calendar</description>
+			<request print-response="no">
+				<method>OPTIONS</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>*DAV$.*calendarserver-sharing.*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Upgrade calendar to shared'>
+		<test name='1'>
+			<description>Create new calendar</description>
+			<request end-delete="yes">
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/shared1/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Not shared</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared1/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value>DAV:resourcetype!.*shared-owner.*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Upgrade via PROPPATCH</description>
+			<request print-response='no'>
+				<method>PROPPATCH</method>
+				<ruri>$pathprefix1:/shared1/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/feature/upgrade_collection/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:resourcetype</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Is shared</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared1/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value>DAV:resourcetype$.*shared-owner.*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Downgrade calendar from shared'>
+		<test name='1'>
+			<description>Create new shared calendar</description>
+			<request end-delete="yes">
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/shared2/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/feature/mkcalendar/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Is shared</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared2/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value>DAV:resourcetype$.*shared-owner.*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Downgrade via PROPPATCH</description>
+			<request>
+				<method>PROPPATCH</method>
+				<ruri>$pathprefix1:/shared2/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/feature/downgrade_collection/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Is not shared</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared2/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value>DAV:resourcetype!.*shared-owner.*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Upgrade calendar to shared via MKCALENDAR'>
+		<test name='1'>
+			<description>Create new calendar</description>
+			<request end-delete="yes">
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/shared3/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/feature/mkcalendar/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Is shared</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared3/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value>DAV:resourcetype$.*shared-owner.*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Upgrade calendar to shared via extended MKCOL'>
+		<require-feature>
+			<feature>Extended MKCOL</feature>
+		</require-feature>
+		<test name='1'>
+			<description>Create new calendar</description>
+			<request end-delete="yes">
+				<method>MKCOL</method>
+				<ruri>$pathprefix1:/shared4/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/feature/mkcol/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Is shared</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared4/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value>DAV:resourcetype$.*shared-owner.*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>

Copied: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-invites.xml)
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,287 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test calendar sharing invitations</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>shared-calendars</feature>
+	</require-feature>
+
+	<start>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath1:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath2:/</ruri>
+		</request>
+		<request end-delete="yes">
+			<method>MKCALENDAR</method>
+			<ruri>$pathprefix1:/shared/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
+			</data>
+			<verify>
+				<callback>statusCode</callback>
+			</verify>
+		</request>
+	</start>
+	
+	<test-suite name='Send new invite'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/invites/new/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/invites/new/2.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Notification type property</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/invites/new/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value><![CDATA[http://calendarserver.org/ns/notification-type$<invite-notification shared-type="calendar"/>]]></value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Update new invite'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/invites/updatenew/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/invites/updatenew/2.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Notification type property</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/invites/updatenew/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value><![CDATA[http://calendarserver.org/ns/notification-type$<invite-notification shared-type="calendar"/>]]></value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Uninvite new invite'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/invites/uninvitenew/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$notificationpath2:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>0</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Delete new invite'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/invites/new/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$notificationpath2:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>1</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>DELETE collection</description>
+			<request print-response='no'>
+				<method>DELETE</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$notificationpath2:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>0</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>

Copied: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-peruser-data.xml)
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,657 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest ignore-all='no'>
+	<description>Test calendar sharing per-user data</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>shared-calendars</feature>
+	</require-feature>
+
+	<start>
+		<request end-delete="yes">
+			<method>MKCALENDAR</method>
+			<ruri>$pathprefix1:/shared/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
+			</data>
+		</request>
+		<request print-response='no'>
+			<method>POST</method>
+			<ruri>$pathprefix1:/shared/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/Common/POST/sharinginvite23.xml</filepath>
+			</data>
+			<verify>
+				<callback>statusCode</callback>
+			</verify>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<method>WAITCOUNT 1</method>
+			<ruri>$notificationpath2:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<method>GETNEW</method>
+			<ruri>$notificationpath2:/</ruri>
+			<grabelement>
+				<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+				<variable>$inviteuid2:</variable>
+			</grabelement>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<method>POST</method>
+			<ruri>$pathprefix2:/</ruri>
+			<data substitutions='yes'>
+				<content-type>application/xml; charset=utf-8</content-type>
+				<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
+			</data>
+			<grabelement>
+				<name>{DAV:}href</name>
+				<variable>$sharedcalendar2:</variable>
+			</grabelement>
+		</request>
+		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<method>WAITCOUNT 1</method>
+			<ruri>$notificationpath3:/</ruri>
+		</request>
+		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<method>GETNEW</method>
+			<ruri>$notificationpath3:/</ruri>
+			<grabelement>
+				<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+				<variable>$inviteuid3:</variable>
+			</grabelement>
+		</request>
+		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<method>POST</method>
+			<ruri>$pathprefix3:/</ruri>
+			<data substitutions='yes'>
+				<content-type>application/xml; charset=utf-8</content-type>
+				<filepath>Resource/Common/POST/sharingreply3.xml</filepath>
+			</data>
+			<grabelement>
+				<name>{DAV:}href</name>
+				<variable>$sharedcalendar3:</variable>
+			</grabelement>
+		</request>
+	</start>
+	
+	<test-suite name='Initial event' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>User01 store to shared</description>
+			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+				<method>PUT</method>
+				<ruri>$pathprefix1:/shared/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</filepath>
+				</data>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>User02 sees event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$sharedcalendar2:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>User03 sees event</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$sharedcalendar3:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='User01 changed event' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>User01 store to shared</description>
+			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+				<method>PUT</method>
+				<ruri>$pathprefix1:/shared/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/simple-change01/1.ics</filepath>
+				</data>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>User02 sees event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$sharedcalendar2:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>User03 sees event</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$sharedcalendar3:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/simple-change01/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='User02 changed event' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>User02 store to shared</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>PUT</method>
+				<ruri>$sharedcalendar2:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/simple-change02/1.ics</filepath>
+				</data>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>User01 sees event</description>
+			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+				<method>GET</method>
+				<ruri>$pathprefix1:/shared/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/simple-change02/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>User03 sees event</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$sharedcalendar3:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/simple-change02/3.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Different freebusy' ignore='no'>
+		<test name='1'>
+			<description>Set properties on new calendars</description>
+			<request print-response='no'>
+				<method>PROPPATCH</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPPATCH/calendar-transp-opaque.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavschedule-calendar-transp</value>
+					</arg>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>PROPPATCH</method>
+				<ruri>$sharedcalendar2:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPPATCH/calendar-transp-opaque.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavschedule-calendar-transp</value>
+					</arg>
+				</verify>
+			</request>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>PROPPATCH</method>
+				<ruri>$sharedcalendar3:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPPATCH/calendar-transp-opaque.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavschedule-calendar-transp</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>User01 freebusy</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$outboxpath1:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr1:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T230000Z/20060102T000000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr2:</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr3:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T230000Z/20060102T000000Z</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>User02 freebusy</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>POST</method>
+				<ruri>$outboxpath2:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics</filepath>
+				</data>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr1:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T230000Z/20060102T000000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr2:</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr3:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T230000Z/20060102T000000Z</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>User03 freebusy</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>POST</method>
+				<ruri>$outboxpath3:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics</filepath>
+				</data>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr1:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T230000Z/20060102T000000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr2:</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr3:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T230000Z/20060102T000000Z</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='User01 complex recurring store' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>User01 store to shared</description>
+			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+				<method>PUT</method>
+				<ruri>$pathprefix1:/shared/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/complex-put/1.ics</filepath>
+				</data>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>User02 sees event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$sharedcalendar2:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/complex-put/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>User03 sees event</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$sharedcalendar3:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/complex-put/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='User02 complex recurring store' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>User02 store to shared</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>PUT</method>
+				<ruri>$sharedcalendar2:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/complex-change02/1.ics</filepath>
+				</data>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>User01 sees event</description>
+			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+				<method>GET</method>
+				<ruri>$pathprefix1:/shared/2.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/complex-change02/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>User03 sees event</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$sharedcalendar3:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-data/complex-change02/3.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Complex freebusy' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>User01 freebusy</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$outboxpath1:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/simple-freebusy/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr1:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T130000Z/20060101T140000Z</value>
+						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>20060103T140000Z/20060103T150000Z</value>
+						<value>20060104T130000Z/20060104T140000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr2:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T130000Z/20060101T140000Z</value>
+						<value>20060102T130000Z/20060102T140000Z</value>
+						<value>20060104T130000Z/20060104T140000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr3:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T130000Z/20060101T140000Z</value>
+						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>20060102T130000Z/20060102T140000Z</value>
+						<value>20060103T140000Z/20060103T150000Z</value>
+						<value>20060104T130000Z/20060104T140000Z</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>User02 freebusy</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>POST</method>
+				<ruri>$outboxpath2:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/simple-freebusy/2.ics</filepath>
+				</data>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr1:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T130000Z/20060101T140000Z</value>
+						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>20060103T140000Z/20060103T150000Z</value>
+						<value>20060104T130000Z/20060104T140000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr2:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T130000Z/20060101T140000Z</value>
+						<value>20060102T130000Z/20060102T140000Z</value>
+						<value>20060104T130000Z/20060104T140000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr3:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T130000Z/20060101T140000Z</value>
+						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>20060102T130000Z/20060102T140000Z</value>
+						<value>20060103T140000Z/20060103T150000Z</value>
+						<value>20060104T130000Z/20060104T140000Z</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>User03 freebusy</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>POST</method>
+				<ruri>$outboxpath3:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-data/simple-freebusy/3.ics</filepath>
+				</data>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr1:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T130000Z/20060101T140000Z</value>
+						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>20060103T140000Z/20060103T150000Z</value>
+						<value>20060104T130000Z/20060104T140000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr2:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T130000Z/20060101T140000Z</value>
+						<value>20060102T130000Z/20060102T140000Z</value>
+						<value>20060104T130000Z/20060104T140000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>postFreeBusy</callback>
+					<arg>
+						<name>attendee</name>
+						<value>$cuaddr3:</value>
+					</arg>
+					<arg>
+						<name>busy</name>
+						<value>20060101T130000Z/20060101T140000Z</value>
+						<value>20060101T230000Z/20060102T000000Z</value>
+						<value>20060102T130000Z/20060102T140000Z</value>
+						<value>20060103T140000Z/20060103T150000Z</value>
+						<value>20060104T130000Z/20060104T140000Z</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<end>
+		<request>
+			<method>DELETEALL</method>
+			<ruri>$notificationpath1:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath2:/</ruri>
+		</request>
+		<request user="$userid3:" pswd="$pswd3:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath3:/</ruri>
+		</request>
+	</end>
+	
+</caldavtest>

Copied: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-peruser-properties.xml)
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,386 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test per-user WebDAV properties</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>shared-calendars</feature>
+	</require-feature>
+
+	<start>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath1:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath2:/</ruri>
+		</request>
+		<request end-delete="yes">
+			<method>MKCALENDAR</method>
+			<ruri>$pathprefix1:/shared/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
+			</data>
+			<verify>
+				<callback>statusCode</callback>
+			</verify>
+		</request>
+	</start>
+	
+	<test-suite name='Read-write calendar'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/read-write/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/peruser-properties/read-write/2.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+					<variable>$inviteuid:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Sharee replies ACCEPTED</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix2:/</ruri>
+				<data substitutions='yes'>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/read-write/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<grabelement>
+					<name>{DAV:}href</name>
+					<variable>$sharedcalendar:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Shared calendar exists</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/read-write/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindValues</callback>
+					<arg>
+						<name>props</name>
+						<value>DAV:resourcetype$.*shared[^-].*</value>
+						<value><![CDATA[DAV:owner$<href>/principals/__uids__/user01/</href>]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set$.*<read/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set$.*<write/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set$.*<bind/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set$.*<unbind/>.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set!.*admin.*]]></value>
+						<value><![CDATA[DAV:current-user-privilege-set!.*all.*]]></value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='prop patches - non-global' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>PROPPATCH of displayname</description>
+			<request print-response='no'>
+				<method>PROPPATCH</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/nonglobal/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:displayname</value>
+					</arg>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:displayname$Changed Name #1</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>PROPFIND of shared displayname</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>badprops</name>
+						<value>DAV:displayname</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>PROPPATCH of displayname</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPPATCH</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/nonglobal/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:displayname</value>
+					</arg>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:displayname$Shared Name #2</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>PROPFIND of shared displayname</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/nonglobal/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:displayname$Changed Name #1</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='prop patches - shadowable' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>PROPPATCH of calendar-description</description>
+			<request print-response='no'>
+				<method>PROPPATCH</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/shadowable/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavcalendar-description</value>
+					</arg>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavcalendar-description$Description #1</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>PROPFIND of shared calendar-description</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavcalendar-description$Description #1</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>PROPPATCH of calendar-description</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPPATCH</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/shadowable/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavcalendar-description</value>
+					</arg>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavcalendar-description$Sharee Description #2</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>PROPFIND of shared calendar-description</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/peruser-properties/shadowable/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavcalendar-description$Description #1</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<end/>
+	
+</caldavtest>

Copied: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-replies.xml)
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,232 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test calendar sharing replies</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>shared-calendars</feature>
+	</require-feature>
+
+	<start>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath1:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath2:/</ruri>
+		</request>
+		<request end-delete="yes">
+			<method>MKCALENDAR</method>
+			<ruri>$pathprefix1:/shared/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
+			</data>
+			<verify>
+				<callback>statusCode</callback>
+			</verify>
+		</request>
+	</start>
+	
+	<test-suite name='Send first reply'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/replies/accept/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/replies/accept/2.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+				<grabelement>
+					<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+					<variable>$inviteuid:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Sharee replies ACCEPTED</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='yes'>
+				<method>POST</method>
+				<ruri>$pathprefix2:/</ruri>
+				<data substitutions='yes'>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/replies/accept/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/replies/accept/7.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{DAV:}href</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Check accept status</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/replies/accept/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/replies/accept/5.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Check Sharer notification collection</description>
+			<request>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath1:/</ruri>
+			</request>
+			<request print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath1:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/replies/accept/6.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Update reply'>
+		<test name='1'>
+			<description>Sharee replies DECLINED</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix2:/</ruri>
+				<data substitutions='yes'>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/replies/decline/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check declined status</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/replies/decline/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/replies/decline/3.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}uid</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Check Sharer notification collection</description>
+			<request>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath1:/</ruri>
+			</request>
+			<request print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath1:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/sharing/replies/decline/4.xml</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>{http://calendarserver.org/ns/}dtstamp</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2010-04-07 19:28:58 UTC (rev 5440)
+++ CalDAVTester/trunk/src/caldavtest.py	2010-04-07 19:59:00 UTC (rev 5441)
@@ -209,6 +209,7 @@
                             rc.append(node)
                 return rc
 
+            request_uri = req.getURI( self.manager.server_info )
             for response in doc.getElementsByTagNameNS( "DAV:", "response" ):
     
                 # Get href for this response
@@ -217,7 +218,7 @@
                     return False, "           Wrong number of DAV:href elements\n"
                 if href[0].firstChild is not None:
                     href = href[0].firstChild.data
-                    if href != req.ruri:
+                    if href != request_uri:
                         hrefs.append((href, collection[1], collection[2]) )
         return hrefs
 
@@ -270,6 +271,7 @@
                 return rc
 
             latest = 0
+            request_uri = req.getURI( self.manager.server_info )
             for response in doc.getElementsByTagNameNS( "DAV:", "response" ):
     
                 # Get href for this response
@@ -278,7 +280,7 @@
                     return False, "           Wrong number of DAV:href elements\n"
                 if href[0].firstChild is not None:
                     href = href[0].firstChild.data
-                    if href != req.ruri:
+                    if href != request_uri:
 
                         # Get all property status
                         propstatus = ElementsByName(response, "DAV:", "propstat")

Copied: CalDAVTester/trunk/verifiers/postFreeBusy.py (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/verifiers/postFreeBusy.py)
===================================================================
--- CalDAVTester/trunk/verifiers/postFreeBusy.py	                        (rev 0)
+++ CalDAVTester/trunk/verifiers/postFreeBusy.py	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,131 @@
+##
+# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Verifier that checks the response of a free-busy-query.
+"""
+
+from vobject.base import VObjectError
+from vobject.base import readOne
+from vobject.icalendar import periodToString
+import StringIO
+import datetime
+from xml.etree.ElementTree import ElementTree
+from xml.parsers.expat import ExpatError
+
+class Verifier(object):
+    
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
+        
+        # Must have status 200
+        if response.status != 200:
+            return False, "        HTTP Status Code Wrong: %d" % (response.status,)
+
+        # Get expected FREEBUSY info
+        users = args.get("attendee", [])
+        busy = args.get("busy", [])
+        tentative = args.get("tentative", [])
+        unavailable = args.get("unavailable", [])
+        
+        # Extract each calendar-data object
+        try:
+            tree = ElementTree(file=StringIO.StringIO(respdata))
+        except ExpatError:
+            return False, "           Could not parse proper XML response\n"
+
+        for calendar in tree.findall("/{urn:ietf:params:xml:ns:caldav}response/{urn:ietf:params:xml:ns:caldav}calendar-data"):
+            # Parse data as calendar object
+            try:
+                s = StringIO.StringIO(calendar.text)
+                calendar = readOne(s)
+                
+                # Check for calendar
+                if calendar.name != "VCALENDAR":
+                    raise ValueError("Top-level component is not a calendar: %s" % (calendar.name, ))
+                
+                # Only one component
+                comps = list(calendar.components())
+                if len(comps) != 1:
+                    raise ValueError("Wrong number of components in calendar")
+                
+                # Must be VFREEBUSY
+                fb = comps[0]
+                if fb.name != "VFREEBUSY":
+                    raise ValueError("Calendar contains unexpected component: %s" % (fb.name, ))
+                
+                # Check for attendee value
+                for attendee in [x for x in fb.lines() if x.name == "ATTENDEE"]:
+                    if attendee.value in users:
+                        break
+                else:
+                    continue
+
+                # Extract periods
+                busyp = []
+                tentativep = []
+                unavailablep = []
+                for fp in [x for x in fb.lines() if x.name == "FREEBUSY"]:
+                    periods = fp.value
+                    # Convert start/duration to start/end
+                    for i in range(len(periods)):
+                        if isinstance(periods[i][1], datetime.timedelta):
+                            periods[i] = (periods[i][0], periods[i][0] + periods[i][1])
+                    # Check param
+                    fbtype = "BUSY"
+                    if "FBTYPE" in fp.params:
+                        fbtype = fp.params["FBTYPE"][0]
+                    if fbtype == "BUSY":
+                        busyp.extend(periods)
+                    elif fbtype == "BUSY-TENTATIVE":
+                        tentativep.extend(periods)
+                    elif fbtype == "BUSY-UNAVAILABLE":
+                        unavailablep.extend(periods)
+                    else:
+                        raise ValueError("Unknown FBTYPE: %s" % (fbtype,))
+                
+                # Set sizes must match
+                if ((len(busy) != len(busyp)) or
+                    (len(unavailable) != len(unavailablep)) or
+                    (len(tentative) != len(tentativep))):
+                    raise ValueError("Period list sizes do not match.")
+                
+                # Convert to string sets
+                busy = set(busy)
+                busyp[:] = [periodToString(x) for x in busyp]
+                busyp = set(busyp)
+                tentative = set(tentative)
+                tentativep[:] = [periodToString(x) for x in tentativep]
+                tentativep = set(tentativep)
+                unavailable = set(unavailable)
+                unavailablep[:] = [periodToString(x) for x in unavailablep]
+                unavailablep = set(unavailablep)
+    
+                # Compare all periods
+                if len(busyp.symmetric_difference(busy)):
+                    raise ValueError("Busy periods do not match")
+                elif len(tentativep.symmetric_difference(tentative)):
+                    raise ValueError("Busy-tentative periods do not match")
+                elif len(unavailablep.symmetric_difference(unavailable)):
+                    raise ValueError("Busy-unavailable periods do not match")
+                
+                break
+                    
+            except VObjectError:
+                return False, "        HTTP response data is not a calendar"
+            except ValueError, txt:
+                return False, "        HTTP response data is invalid: %s" % (txt,)
+            
+        return True, ""

Copied: CalDAVTester/trunk/verifiers/xmlDataMatch.py (from rev 5440, CalDAVTester/branches/users/cdaboo/sharing-5228/verifiers/xmlDataMatch.py)
===================================================================
--- CalDAVTester/trunk/verifiers/xmlDataMatch.py	                        (rev 0)
+++ CalDAVTester/trunk/verifiers/xmlDataMatch.py	2010-04-07 19:59:00 UTC (rev 5441)
@@ -0,0 +1,86 @@
+##
+# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from difflib import unified_diff
+import StringIO
+from xml.etree.ElementTree import ElementTree, tostring
+
+"""
+Verifier that checks the response body for an exact match to data in a file.
+"""
+
+class Verifier(object):
+    
+    def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
+        # Get arguments
+        files = args.get("filepath", [])
+        filters = args.get("filter", [])
+ 
+        # status code must be 200, 207
+        if response.status not in (200,207):
+            return False, "        HTTP Status Code Wrong: %d" % (response.status,)
+        
+        # look for response data
+        if not respdata:
+            return False, "        No response body"
+        
+        # look for one file
+        if len(files) != 1:
+            return False, "        No file to compare response to"
+        
+        # read in all data from specified file
+        fd = open( files[0], "r" )
+        try:
+            try:
+                data = fd.read()
+            finally:
+                fd.close()
+        except:
+            data = None
+
+        if data is None:
+            return False, "        Could not read data file"
+
+        data = manager.server_info.subs(data)
+        data = manager.server_info.extrasubs(data)
+        
+        def normalizeXMLData(data):
+            # Read in XML
+            try:
+                tree = ElementTree(file=StringIO.StringIO(data))
+            except Exception:
+                raise ValueError("Could not parse XML data")
+            
+            # Apply filters
+            for filter in filters:
+                for node in tree.getiterator(filter):
+                    node.clear()
+            return tostring(tree.getroot())
+
+        try:
+            respdata = normalizeXMLData(respdata)
+            data = normalizeXMLData(data)
+            
+            result = respdata == data
+                    
+            if result:
+                return True, ""
+            else:
+                error_diff = "\n".join([line for line in unified_diff(data.split("\n"), respdata.split("\n"))])
+                return False, "        Response data does not exactly match file data%s" % (error_diff,)
+        except Exception, e:
+            return False, "        Response data is not xml data: %s" % (e,)
+            
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100407/273559b2/attachment-0001.html>