[CalendarServer-changes] [8348] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Nov 28 19:25:36 PST 2011


Revision: 8348
          http://trac.macosforge.org/projects/calendarserver/changeset/8348
Author:   cdaboo at apple.com
Date:     2011-11-28 19:25:36 -0800 (Mon, 28 Nov 2011)
Log Message:
-----------
Merge split-collections branch to trunk.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/acls/17.ics
    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/acl.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd
    CalDAVTester/trunk/scripts/tests/CalDAV/delete.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/limits.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/mkcalendar.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/recurrenceput.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
    CalDAVTester/trunk/src/caldavtest.py
    CalDAVTester/trunk/src/request.py
    CalDAVTester/trunk/verifiers/xmlElementMatch.py

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/encodedURIs/
    CalDAVTester/trunk/Resource/CalDAV/encodedURIs/doubleencoded1.xml
    CalDAVTester/trunk/Resource/CalDAV/encodedURIs/encoded1.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/1.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/4.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/7.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/single-components/
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/single-components/1.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/supported-component-sets/
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/1b.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/4b.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/5b.xml
    CalDAVTester/trunk/Resource/Common/MKCALENDAR/AllComponents.xml

Removed Paths:
-------------
    CalDAVTester/trunk/Resource/CalDAV/encodedURIs/doubleencoded1.xml
    CalDAVTester/trunk/Resource/CalDAV/encodedURIs/encoded1.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/1.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/4.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/7.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/single-components/1.xml
    CalDAVTester/trunk/Resource/CalDAV/mkcalendar/supported-component-sets/1.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/release/CalDAVTester-3.0-dev:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440

Modified: CalDAVTester/trunk/Resource/CalDAV/acls/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/acls/17.ics	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/Resource/CalDAV/acls/17.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -2,10 +2,10 @@
 CALSCALE:GREGORIAN
 PRODID:-//Example Inc.//Example Calendar//EN
 VERSION:2.0
-BEGIN:VTODO
+BEGIN:VEVENT
 DTSTAMP:20060313T145240Z
-STATUS:NEEDS-ACTION
-SUMMARY:Task #1
+DTSTART:20060313T145240Z
+SUMMARY:Event #1
 UID:961FBB7850529AAA6195464A--2345 at example.local
-END:VTODO
+END:VEVENT
 END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/encodedURIs/doubleencoded1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/doubleencoded1.xml	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/encodedURIs/doubleencoded1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data>
-<C:comp name="VCALENDAR">
-<C:allprop/>
-<C:allcomp/>
-</C:comp>
-</C:calendar-data>
-</D:prop>
-<D:href>$calendarpath1:/3%2520a.ics</D:href>
-</C:calendar-multiget>

Copied: CalDAVTester/trunk/Resource/CalDAV/encodedURIs/doubleencoded1.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/doubleencoded1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/encodedURIs/doubleencoded1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/encodedURIs/doubleencoded1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data>
+<C:comp name="VCALENDAR">
+<C:allprop/>
+<C:allcomp/>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<D:href>$calendarpath1:/3%2520a.ics</D:href>
+</C:calendar-multiget>

Deleted: CalDAVTester/trunk/Resource/CalDAV/encodedURIs/encoded1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/encoded1.xml	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/encodedURIs/encoded1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data>
-<C:comp name="VCALENDAR">
-<C:allprop/>
-<C:allcomp/>
-</C:comp>
-</C:calendar-data>
-</D:prop>
-<D:href>$calendarpath1:/2%20a.ics</D:href>
-</C:calendar-multiget>

Copied: CalDAVTester/trunk/Resource/CalDAV/encodedURIs/encoded1.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/encoded1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/encodedURIs/encoded1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/encodedURIs/encoded1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data>
+<C:comp name="VCALENDAR">
+<C:allprop/>
+<C:allcomp/>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<D:href>$calendarpath1:/2%20a.ics</D:href>
+</C:calendar-multiget>


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/1.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/1.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/1.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/1.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/1.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/1.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/1.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/1.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/1.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/1.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/1.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/1.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/1.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/1.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/1.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/1.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/10.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/10.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/10.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/10.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/10.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/10.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/10.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/10.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/10.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/10.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/10.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/10.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/10.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/10.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/10.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/10.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/11.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/11.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/11.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/11.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/11.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/11.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/11.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/11.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/11.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/11.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/11.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/11.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/11.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/11.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/11.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/11.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/12.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/12.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/12.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/12.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/12.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/12.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/12.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/12.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/12.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/12.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/12.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/12.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/12.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/12.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/12.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/12.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/13.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/13.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/13.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/13.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/13.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/13.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/13.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/13.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/13.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/13.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/13.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/13.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/13.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/13.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/13.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/13.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/14.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/14.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/14.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/14.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/14.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/14.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/14.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/14.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/14.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/14.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/14.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/14.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/14.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/14.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/14.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/14.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/15.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/15.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/15.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/15.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/15.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/15.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/15.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/15.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/15.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/15.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/15.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/15.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/15.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/15.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/15.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/15.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/16.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/16.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/16.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/16.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/16.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/16.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/16.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/16.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/16.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/16.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/16.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/16.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/16.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/16.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/16.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/16.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/17.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/17.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/17.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/17.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/17.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/17.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/17.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/17.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/17.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/17.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/17.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/17.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/17.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/17.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/17.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/17.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/18.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/18.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/18.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/18.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/18.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/18.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/18.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/18.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/18.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/18.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/18.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/18.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/18.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/18.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/18.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/18.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/19.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/19.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/19.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/19.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/19.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/19.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/19.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/19.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/19.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/19.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/19.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/19.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/19.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/19.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/19.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/19.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/2.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/2.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/2.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/2.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/2.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/2.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/2.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/2.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/2.ics:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/2.ics:7584
/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/component-set-fixes/Resource/CalDAV/errors/2.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/2.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/2.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/2.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/2.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/2.ics:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/20.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/20.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/20.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/20.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/20.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/20.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/20.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/20.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/20.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/20.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/20.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/20.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/20.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/20.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/20.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/20.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/21.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/21.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/21.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/21.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/21.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/21.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/21.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/21.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/21.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/21.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/21.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/21.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/21.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/21.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/21.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/21.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/22.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/22.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/22.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/22.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/22.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/22.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/22.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/22.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/22.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/22.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/22.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/22.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/22.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/22.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/22.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/22.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/23.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/23.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/23.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/23.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/23.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/23.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/23.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/23.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/23.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/23.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/23.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/23.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/23.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/23.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/23.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/23.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/24.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/24.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/24.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/24.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/24.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/24.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/24.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/24.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/24.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/24.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/24.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/24.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/24.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/24.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/24.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/24.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/25.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/25.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/25.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/25.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/25.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/25.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/25.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/25.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/25.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/25.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/25.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/25.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/25.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/25.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/25.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/25.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/26.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/26.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/26.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/26.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/26.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/26.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/26.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/26.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/26.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/26.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/26.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/26.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/26.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/26.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/26.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/26.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/27.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/27.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/27.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/27.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/27.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/27.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/27.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/27.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/27.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/27.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/27.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/27.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/27.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/27.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/27.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/27.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/28.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/28.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/28.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/28.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/28.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/28.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/28.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/28.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/28.ics:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/28.ics:7584
/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/component-set-fixes/Resource/CalDAV/errors/28.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/28.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/28.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/28.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/28.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/28.ics:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/29.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/29.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/29.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/29.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/29.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/29.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/29.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/29.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/29.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/29.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/29.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/29.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/29.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/29.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/29.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/29.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/3.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/3.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/3.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/3.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/3.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/3.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/3.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/3.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/3.ics:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/3.ics:7584
/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/component-set-fixes/Resource/CalDAV/errors/3.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/3.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/3.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/3.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/3.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/3.ics:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/30.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/30.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/30.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/30.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/30.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/30.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/30.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/30.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/30.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/30.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/30.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/30.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/30.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/30.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/30.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/30.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/31.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/31.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/31.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/31.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/31.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/31.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/31.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/31.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/31.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/31.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/31.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/31.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/31.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/31.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/31.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/31.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/32.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/32.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/32.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/32.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/32.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/32.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/32.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/32.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/32.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/32.xml:7584
/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/component-set-fixes/Resource/CalDAV/errors/32.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/32.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/32.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/32.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/32.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/32.xml:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/4.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/4.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/4.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/4.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/4.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/4.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/4.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/4.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/4.ics:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/4.ics:7584
/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/component-set-fixes/Resource/CalDAV/errors/4.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/4.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/4.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/4.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/4.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/4.ics:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/5.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/5.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/5.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/5.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/5.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/5.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/5.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/5.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/5.ics:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/5.ics:7584
/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/component-set-fixes/Resource/CalDAV/errors/5.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/5.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/5.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/5.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/5.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/5.ics:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/6.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/6.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/6.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/6.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/6.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/6.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/6.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/6.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/6.ics:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/6.ics:7584
/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/component-set-fixes/Resource/CalDAV/errors/6.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/6.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/6.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/6.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/6.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/6.ics:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/7.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/7.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/7.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/7.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/7.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/7.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/7.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/7.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/7.ics:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/7.ics:7584
/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/component-set-fixes/Resource/CalDAV/errors/7.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/7.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/7.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/7.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/7.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/7.ics:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/8.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/8.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/8.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/8.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/8.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/8.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/8.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/8.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/8.ics:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/8.ics:7584
/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/component-set-fixes/Resource/CalDAV/errors/8.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/8.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/8.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/8.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/8.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/8.ics:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/errors/9.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/9.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/9.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/9.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/9.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/9.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/9.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/9.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/9.ics:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/errors/9.ics:7584
/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/component-set-fixes/Resource/CalDAV/errors/9.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/9.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/9.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/errors/9.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/errors/9.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/errors/9.ics:5229-5440


Property changes on: CalDAVTester/trunk/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/1.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/1.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/1.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/1.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/1.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/1.ics:2451,3035,3142,3165,3190,3405,3432
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:7584
/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/component-set-fixes/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/1.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/1.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/1.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/1.ics:7226-7237
/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/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/2.xml:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/2.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/2.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/2.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/2.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/2.xml:2451,3035,3142,3165,3190,3405,3432
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:7584
/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/component-set-fixes/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/2.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/2.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/2.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/2.xml:7226-7237
/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/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/3.xml:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/3.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/3.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/3.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/3.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/3.xml:2451,3035,3142,3165,3190,3405,3432
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:7584
/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/component-set-fixes/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/3.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/3.xml:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/3.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/3.xml:7226-7237
/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/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/4.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/4.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/4.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/4.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/4.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/4.ics:2451,3035,3142,3165,3190,3405,3432
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:7584
/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/component-set-fixes/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/4.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/4.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/4.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/4.ics:7226-7237
/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/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/5.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/5.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/5.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/5.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/5.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/5.ics:2451,3035,3142,3165,3190,3405,3432
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:7584
/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/component-set-fixes/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/5.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/5.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/5.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/5.ics:7226-7237
/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/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/6.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/6.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/6.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/6.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/6.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/6.ics:2451,3035,3142,3165,3190,3405,3432
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:7584
/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/component-set-fixes/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/6.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/6.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/6.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/6.ics:7226-7237
/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/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/7.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/7.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/7.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/7.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/7.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/7.ics:2451,3035,3142,3165,3190,3405,3432
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:7584
/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/component-set-fixes/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/7.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/7.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/7.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/7.ics:7226-7237
/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/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:7584
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/implicit/schedulechanges/8.ics:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/implicit/schedulechanges/8.ics:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/8.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/8.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/8.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:5229-5440
/CalDAVTester/trunk/Resource/implicit/schedulechanges/8.ics:2451,3035,3142,3165,3190,3405,3432
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:7584
/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/component-set-fixes/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:8221-8346
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/implicit/schedulechanges/8.ics:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/implicit/schedulechanges/8.ics:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/implicit/schedulechanges/8.ics:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CalDAV/implicit/schedulechanges/organizerchange/8.ics:7226-7237
/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/mkcalendar/restrictions/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/1.xml	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:set>
-<D:prop>
-<C:supported-calendar-component-set>
-<C:comp name="VEVENT"/>
-</C:supported-calendar-component-set>
-</D:prop>
-</D:set>
-</C:mkcalendar>

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/1.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+<C:supported-calendar-component-set>
+<C:comp name="VEVENT"/>
+</C:supported-calendar-component-set>
+</D:prop>
+</D:set>
+</C:mkcalendar>

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/2.ics	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,11 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:put-1 at example.com
-DTSTART:20110427
-DURATION:P1DT
-DTSTAMP:20051222T205953Z
-SUMMARY:event 1
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/2.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/2.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,11 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-1 at example.com
+DTSTART:20110427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/3.ics	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,10 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTODO
-UID:put-2 at example.com
-DUE:20110427
-DTSTAMP:20051222T205953Z
-SUMMARY:todo 1
-END:VTODO
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/3.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/3.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,10 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTODO
+UID:put-2 at example.com
+DUE:20110427
+DTSTAMP:20051222T205953Z
+SUMMARY:todo 1
+END:VTODO
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/4.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/4.xml	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/4.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:set>
-<D:prop>
-<C:supported-calendar-component-set>
-<C:comp name="VTODO"/>
-</C:supported-calendar-component-set>
-</D:prop>
-</D:set>
-</C:mkcalendar>

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/4.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/4.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/4.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/4.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+<C:supported-calendar-component-set>
+<C:comp name="VTODO"/>
+</C:supported-calendar-component-set>
+</D:prop>
+</D:set>
+</C:mkcalendar>

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/5.ics	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,11 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:put-5 at example.com
-DTSTART:20110427
-DURATION:P1DT
-DTSTAMP:20051222T205953Z
-SUMMARY:event 5
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/5.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/5.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,11 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-5 at example.com
+DTSTART:20110427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 5
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/6.ics	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,10 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTODO
-UID:put-6 at example.com
-DUE:20110427
-DTSTAMP:20051222T205953Z
-SUMMARY:todo 6
-END:VTODO
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/6.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/6.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,10 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTODO
+UID:put-6 at example.com
+DUE:20110427
+DTSTAMP:20051222T205953Z
+SUMMARY:todo 6
+END:VTODO
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/7.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/7.xml	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/7.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:set>
-<D:prop>
-<C:supported-calendar-component-set>
-<C:comp name="VTODO"/>
-<C:comp name="VEVENT"/>
-</C:supported-calendar-component-set>
-</D:prop>
-</D:set>
-</C:mkcalendar>

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/7.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/7.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/7.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/7.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+<C:supported-calendar-component-set>
+<C:comp name="VTODO"/>
+<C:comp name="VEVENT"/>
+</C:supported-calendar-component-set>
+</D:prop>
+</D:set>
+</C:mkcalendar>

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/8.ics	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,11 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:put-8 at example.com
-DTSTART:20110427
-DURATION:P1DT
-DTSTAMP:20051222T205953Z
-SUMMARY:event 8
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/8.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/8.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,11 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-8 at example.com
+DTSTART:20110427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 8
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/9.ics	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -1,10 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTODO
-UID:put-9 at example.com
-DUE:20110427
-DTSTAMP:20051222T205953Z
-SUMMARY:todo 9
-END:VTODO
-END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/9.ics)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/restrictions/9.ics	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,10 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTODO
+UID:put-9 at example.com
+DUE:20110427
+DTSTAMP:20051222T205953Z
+SUMMARY:todo 9
+END:VTODO
+END:VCALENDAR

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/single-components/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/single-components/1.xml	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/single-components/1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -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:supported-calendar-component-set/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/single-components/1.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/single-components/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/single-components/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/single-components/1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -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:supported-calendar-component-set/>
+</D:prop>
+</D:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml	2011-11-28 21:07:52 UTC (rev 8346)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -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:supported-calendar-component-sets/>
-</D:prop>
-</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -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:supported-calendar-component-sets/>
+</D:prop>
+</D:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/1b.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1b.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/1b.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/1b.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data>
+<C:comp name="VCALENDAR">
+<C:allprop/>
+<C:allcomp/>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<D:href>$taskspath1:/1.ics</D:href>
+<D:href>$taskspath1:/2.ics</D:href>
+<D:href>$taskspath1:/3.ics</D:href>
+<D:href>$taskspath1:/4.ics</D:href>
+<D:href>$taskspath1:/101.ics</D:href>
+<D:href>$taskspath1:/102.ics</D:href>
+</C:calendar-multiget>

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/4b.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4b.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/4b.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/4b.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data>
+<C:comp name="VCALENDAR">
+<C:allprop/>
+<C:comp name="VEVENT">
+<C:prop name="SUMMARY"/>
+<C:prop name="UID"/>
+<C:allcomp/>
+</C:comp>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<D:href>$taskspath1:/1.ics</D:href>
+<D:href>$taskspath1:/2.ics</D:href>
+<D:href>$taskspath1:/3.ics</D:href>
+<D:href>$taskspath1:/4.ics</D:href>
+<D:href>$taskspath1:/101.ics</D:href>
+<D:href>$taskspath1:/102.ics</D:href>
+</C:calendar-multiget>

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/5b.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5b.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/5b.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/5b.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data>
+<C:comp name="VCALENDAR">
+<C:allprop/>
+<C:comp name="VEVENT">
+<C:prop name="SUMMARY" novalue="yes"/>
+<C:prop name="UID"/>
+<C:allcomp/>
+</C:comp>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<D:href>$taskspath1:/1.ics</D:href>
+<D:href>$taskspath1:/2.ics</D:href>
+<D:href>$taskspath1:/3.ics</D:href>
+<D:href>$taskspath1:/4.ics</D:href>
+<D:href>$taskspath1:/101.ics</D:href>
+<D:href>$taskspath1:/102.ics</D:href>
+</C:calendar-multiget>

Copied: CalDAVTester/trunk/Resource/Common/MKCALENDAR/AllComponents.xml (from rev 8346, CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/Common/MKCALENDAR/AllComponents.xml)
===================================================================
--- CalDAVTester/trunk/Resource/Common/MKCALENDAR/AllComponents.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/MKCALENDAR/AllComponents.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+<C:supported-calendar-component-set>
+<C:comp name="VEVENT"/>
+<C:comp name="VTODO"/>
+<C:comp name="VFREEBUSY"/>
+</C:supported-calendar-component-set>
+</D:prop>
+</D:set>
+</C:mkcalendar>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -69,6 +69,9 @@
 		<feature>query-extended</feature>				<!-- calendar-query-extended extension -->
 		<feature>shared-calendars</feature>				<!-- Shared calendars extension -->
 		<feature>schedule-changes</feature>				<!-- schedule-changes property extension -->
+		<feature>split-calendars</feature>				<!-- Calendars are split by component type -->
+		<feature>supported-component-sets</feature>		<!-- CALDAV:supported-calendar-component-sets on calendar homes -->
+		<feature>supported-component-sets-one</feature>	<!-- Only single component calendars allowed to be created -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 		<feature>webcal</feature>						<!-- Internet calendar subscription via GET on calendar collection -->
@@ -213,6 +216,12 @@
 			<value>calendar</value>
 		</substitution>
 
+		<!-- primary tasks-only calendar name-->
+		<substitution>
+			<key>$tasks:</key>
+			<value>tasks</value>
+		</substitution>
+
 		<!-- inbox name-->
 		<substitution>
 			<key>$inbox:</key>
@@ -402,11 +411,26 @@
 				<key>$pathprefix%d:</key>
 				<value>$calendars_uids:$userguid%d:</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 calendar-->
 			<substitution>
 				<key>$calendarpath%d:</key>
 				<value>$calendars_uids:$userguid%d:/$calendar:</value>
 			</substitution>
+			<!-- relative path to user alternate calendar-->
+			<substitution>
+				<key>$calendarpathalt%d:</key>
+				<value>$calendars_users:$userid%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to user tasks calendar-->
+			<substitution>
+				<key>$taskspath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$tasks:</value>
+			</substitution>
 			<!-- relative path to user inbox-->
 			<substitution>
 				<key>$inboxpath%d:</key>
@@ -432,17 +456,7 @@
 				<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:@example.com</value>
 			</substitution>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -46,7 +46,7 @@
 		<feature>only-proxy-groups</feature>			<!-- Group-membership only includes delegated-to groups -->
 		<feature>limits</feature>						<!-- max-collections and max-resources limits -->
 		<feature>quota</feature>						<!-- WebDAV QUOTA -->
-		<feature>quota-on-resources</feature>			<!-- WebDAV QUOTA on calendar and address book object resources -->
+		<!-- <feature>quota-on-resources</feature> -->	<!-- WebDAV QUOTA on calendar and address book object resources -->
 		<feature>resource-id</feature>					<!-- WebDAV BIND DAV:resource-id property -->
 		<feature>sync-report</feature>					<!-- WebDAV collection sync REPORT -->
 		<feature>well-known</feature>					<!-- well-known feature -->
@@ -69,6 +69,9 @@
 		<feature>query-extended</feature>				<!-- calendar-query-extended extension -->
 		<feature>shared-calendars</feature>				<!-- Shared calendars extension -->
 		<feature>schedule-changes</feature>				<!-- schedule-changes property extension -->
+		<feature>split-calendars</feature>				<!-- Calendars are split by component type -->
+		<feature>supported-component-sets</feature>		<!-- CALDAV:supported-calendar-component-sets on calendar homes -->
+		<feature>supported-component-sets-one</feature>	<!-- Only single component calendars allowed to be created -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 		<feature>webcal</feature>						<!-- Internet calendar subscription via GET on calendar collection -->
@@ -213,6 +216,12 @@
 			<value>calendar</value>
 		</substitution>
 
+		<!-- primary tasks-only calendar name-->
+		<substitution>
+			<key>$tasks:</key>
+			<value>tasks</value>
+		</substitution>
+
 		<!-- inbox name-->
 		<substitution>
 			<key>$inbox:</key>
@@ -416,6 +425,11 @@
 				<key>$calendarpathalt%%d:</key>
 				<value>$calendars_users:$userid%%d:/$calendar:</value>
 			</substitution>
+			<!-- relative path to user tasks calendar-->
+			<substitution>
+				<key>$taskspath%%d:</key>
+				<value>$calendars_uids:$userguid%%d:/$tasks:</value>
+			</substitution>
 			<!-- relative path to user inbox-->
 			<substitution>
 				<key>$inboxpath%%d:</key>

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -69,6 +69,9 @@
 		<feature>query-extended</feature>				<!-- calendar-query-extended extension -->
 		<feature>shared-calendars</feature>				<!-- Shared calendars extension -->
 		<feature>schedule-changes</feature>				<!-- schedule-changes property extension -->
+		<feature>split-calendars</feature>				<!-- Calendars are split by component type -->
+		<feature>supported-component-sets</feature>		<!-- CALDAV:supported-calendar-component-sets on calendar homes -->
+		<feature>supported-component-sets-one</feature>	<!-- Only single component calendars allowed to be created -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 		<feature>webcal</feature>						<!-- Internet calendar subscription via GET on calendar collection -->
@@ -213,6 +216,12 @@
 			<value>calendar</value>
 		</substitution>
 
+		<!-- primary tasks-only calendar name-->
+		<substitution>
+			<key>$tasks:</key>
+			<value>tasks</value>
+		</substitution>
+
 		<!-- inbox name-->
 		<substitution>
 			<key>$inbox:</key>
@@ -417,6 +426,11 @@
 				<key>$calendarpathalt%d:</key>
 				<value>$calendars_users:$userid%d:/$calendar:</value>
 			</substitution>
+			<!-- relative path to user tasks calendar-->
+			<substitution>
+				<key>$taskspath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$tasks:</value>
+			</substitution>
 			<!-- relative path to user inbox-->
 			<substitution>
 				<key>$inboxpath%d:</key>

Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -70,6 +70,9 @@
 		<feature>query-extended</feature>				<!-- calendar-query-extended extension -->
 		<feature>shared-calendars</feature>				<!-- Shared calendars extension -->
 		<feature>schedule-changes</feature>				<!-- schedule-changes property extension -->
+		<feature>split-calendars</feature>				<!-- Calendars are split by component type -->
+		<feature>supported-component-sets</feature>		<!-- CALDAV:supported-calendar-component-sets on calendar homes -->
+		<feature>supported-component-sets-one</feature>	<!-- Only single component calendars allowed to be created -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
 		<feature>webcal</feature>						<!-- Internet calendar subscription via GET on calendar collection -->
@@ -214,6 +217,12 @@
 			<value>calendar</value>
 		</substitution>
 
+		<!-- primary tasks-only calendar name-->
+		<substitution>
+			<key>$tasks:</key>
+			<value>tasks</value>
+		</substitution>
+
 		<!-- inbox name-->
 		<substitution>
 			<key>$inbox:</key>
@@ -403,11 +412,26 @@
 				<key>$pathprefix%d:</key>
 				<value>$calendars_uids:$userguid%d:</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 calendar-->
 			<substitution>
 				<key>$calendarpath%d:</key>
 				<value>$calendars_uids:$userguid%d:/$calendar:</value>
 			</substitution>
+			<!-- relative path to user alternate calendar-->
+			<substitution>
+				<key>$calendarpathalt%d:</key>
+				<value>$calendars_users:$userid%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to user tasks calendar-->
+			<substitution>
+				<key>$taskspath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$tasks:</value>
+			</substitution>
 			<!-- relative path to user inbox-->
 			<substitution>
 				<key>$inboxpath%d:</key>
@@ -433,17 +457,7 @@
 				<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:@example.com</value>
 			</substitution>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -45,7 +45,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/1todo.ics</ruri>
+			<ruri>$taskspath1:/1todo.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/todo/1.txt</filepath>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -57,7 +57,7 @@
 			<description>VTODO with image/jpeg</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/2.ics</ruri>
+				<ruri>$taskspath1:/2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/attachments/2.ics</filepath>
@@ -68,7 +68,7 @@
 			</request>
 			<request>
 				<method>GET</method>
-				<ruri>$calendarpath1:/2.ics</ruri>
+				<ruri>$taskspath1:/2.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -110,7 +110,7 @@
 			<description>VTODO with image/jpeg</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/4.ics</ruri>
+				<ruri>$taskspath1:/4.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/attachments/4.ics</filepath>
@@ -121,7 +121,7 @@
 			</request>
 			<request>
 				<method>GET</method>
-				<ruri>$calendarpath1:/4.ics</ruri>
+				<ruri>$taskspath1:/4.ics</ruri>
 				<verify>
 					<callback>dataString</callback>
 					<arg>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -97,6 +97,9 @@
 					<filepath>Resource/CalDAV/availability/1.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>xmlElementMatch</callback>
 					<arg>
 						<name>exists</name>
@@ -106,6 +109,16 @@
 						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VFREEBUSY"]</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VEVENT"]</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 	</test-suite>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd	2011-11-29 03:25:36 UTC (rev 8348)
@@ -47,7 +47,7 @@
 			<!ELEMENT content-type (#PCDATA)>
 			<!ELEMENT filepath (#PCDATA)>
 
-		<!ELEMENT verify (callback, arg*)>
+		<!ELEMENT verify (require-feature?, exclude-feature?, callback, arg*)>
 			
 				<!ELEMENT callback (#PCDATA)>
 				<!ELEMENT arg (name, value*)>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/delete.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/delete.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/delete.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -37,7 +37,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/1todo.ics</ruri>
+			<ruri>$taskspath1:/1todo.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/todo/1.txt</filepath>
@@ -60,7 +60,7 @@
 			<description>DELETE existing VTODO</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$calendarpath1:/1todo.ics</ruri>
+				<ruri>$taskspath1:/1todo.ics</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -221,7 +221,7 @@
 				<ruri>$calendarpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/reports/multiget/encoded1.xml</filepath>
+					<filepath>Resource/CalDAV/encodedURIs/encoded1.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -505,7 +505,7 @@
 				<ruri>$calendarpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/reports/multiget/doubleencoded1.xml</filepath>
+					<filepath>Resource/CalDAV/encodedURIs/doubleencoded1.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>


Property changes on: CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/implicitoptions.xml:7584
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/implicitoptions.xml:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/implicitoptions.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/implicitoptions.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/scripts/tests/CalDAV/implicitoptions.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitoptions.xml:5229-5440
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/implicitoptions.xml:7584
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/implicitoptions.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/implicitoptions.xml:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/implicitoptions.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/implicitoptions.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/scripts/tests/CalDAV/implicitoptions.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitoptions.xml:5229-5440

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -29,15 +29,15 @@
 	<start>
 		<request user="$userid1:" pswd="$pswd1:">
 			<method>GET</method>
-			<ruri>$calendarpath1:/</ruri>
+			<ruri>$taskspath1:/</ruri>
 		</request>
 		<request user="$userid2:" pswd="$pswd2:">
 			<method>GET</method>
-			<ruri>$calendarpath2:/</ruri>
+			<ruri>$taskspath2:/</ruri>
 		</request>
 		<request user="$userid3:" pswd="$pswd3:">
 			<method>GET</method>
-			<ruri>$calendarpath3:/</ruri>
+			<ruri>$taskspath3:/</ruri>
 		</request>
 	</start>
 	
@@ -46,7 +46,7 @@
 			<description>Organizer invites Attendee</description>
 			<request print-response='no'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/todo/simple/1.ics</filepath>
@@ -60,7 +60,7 @@
 			<description>Organizer checks data</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -122,7 +122,7 @@
 			<description>Attendee has data</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -157,7 +157,7 @@
 			<description>Attendee -> Accepted</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -229,7 +229,7 @@
 			<description>Organizer data changed</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -264,7 +264,7 @@
 			<description>Organizer adds DUE</description>
 			<request print-response='no'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/todo/simple/7.ics</filepath>
@@ -278,7 +278,7 @@
 			<description>Organizer checks data</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -342,7 +342,7 @@
 			<description>Attendee has data</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -377,7 +377,7 @@
 			<description>Attendee -> Declined</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -449,7 +449,7 @@
 			<description>Organizer data changed</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -484,7 +484,7 @@
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 			</request>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
@@ -492,7 +492,7 @@
 			</request>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 			</request>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
@@ -506,7 +506,7 @@
 			<description>Organizer invites Attendee</description>
 			<request print-response='no'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/2.ics</ruri>
+				<ruri>$taskspath1:/2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/todo/organizerdelete/1.ics</filepath>
@@ -520,7 +520,7 @@
 			<description>Organizer checks data</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/2.ics</ruri>
+				<ruri>$taskspath1:/2.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -568,7 +568,7 @@
 			<description>Attendee has data</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -603,7 +603,7 @@
 			<description>Attendee -> Accepted</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -646,7 +646,7 @@
 			<description>Organizer data changed</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/2.ics</ruri>
+				<ruri>$taskspath1:/2.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -681,7 +681,7 @@
 			<description>Organizer deletes data</description>
 			<request print-response='no'>
 				<method>DELETE</method>
-				<ruri>$calendarpath1:/2.ics</ruri>
+				<ruri>$taskspath1:/2.ics</ruri>
 				<verify>
 					<callback>statusCode</callback>
 					<arg>
@@ -748,7 +748,7 @@
 			<description>Attendee has cancelled data</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -793,7 +793,7 @@
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 			</request>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
@@ -801,7 +801,7 @@
 			</request>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 			</request>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
@@ -815,7 +815,7 @@
 			<description>Organizer invites Attendee</description>
 			<request print-response='no'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/3.ics</ruri>
+				<ruri>$taskspath1:/3.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/todo/attendeedelete/1.ics</filepath>
@@ -829,7 +829,7 @@
 			<description>Organizer checks data</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/3.ics</ruri>
+				<ruri>$taskspath1:/3.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -865,7 +865,7 @@
 			<description>Attendee has data</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -900,7 +900,7 @@
 			<description>Attendee -> Accepted</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -943,7 +943,7 @@
 			<description>Organizer data changed</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/3.ics</ruri>
+				<ruri>$taskspath1:/3.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -978,7 +978,7 @@
 			<description>Attendee deletes data</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -1021,7 +1021,7 @@
 			<description>Organizer data changed</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/3.ics</ruri>
+				<ruri>$taskspath1:/3.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1056,7 +1056,7 @@
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 			</request>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
@@ -1064,7 +1064,7 @@
 			</request>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 			</request>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
@@ -1078,7 +1078,7 @@
 			<description>Organizer invites two Attendees</description>
 			<request print-response='no'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/todo/completed/1.ics</filepath>
@@ -1092,7 +1092,7 @@
 			<description>Organizer checks data</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1128,7 +1128,7 @@
 			<description>Attendee 2 has data</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1185,7 +1185,7 @@
 			<description>Attendee 3 has data</description>
 			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath3:/</ruri>
+				<ruri>$taskspath3:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1220,7 +1220,7 @@
 			<description>Attendee 2 -> Completed</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -1263,7 +1263,7 @@
 			<description>Organizer data changed</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1298,7 +1298,7 @@
 			<description>Attendee 3 data changed</description>
 			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath3:/</ruri>
+				<ruri>$taskspath3:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1312,7 +1312,7 @@
 			<description>Attendee 3 -> Completed</description>
 			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath3:/</ruri>
+				<ruri>$taskspath3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -1355,7 +1355,7 @@
 			<description>Organizer data changed</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1390,7 +1390,7 @@
 			<description>Attendee 2 data changed</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1404,17 +1404,17 @@
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath3:/</ruri>
+				<ruri>$taskspath3:/</ruri>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
@@ -1425,7 +1425,7 @@
 			<description>Organizer invites Attendee</description>
 			<request print-response='no'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/todo/missing/1.ics</filepath>
@@ -1439,7 +1439,7 @@
 			<description>Organizer checks data</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1475,7 +1475,7 @@
 			<description>Attendee has data</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1510,7 +1510,7 @@
 			<description>Organizer updates but loses properties</description>
 			<request print-response='no'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/todo/missing/4.ics</filepath>
@@ -1524,7 +1524,7 @@
 			<description>Organizer checks data - properties are back</description>
 			<request print-response='no'>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
+				<ruri>$taskspath1:/1.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1538,7 +1538,7 @@
 			<description>Attendee -> Completed and loses properties</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -1559,7 +1559,7 @@
 			<description>Attendee has data - properties are back</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -1569,11 +1569,11 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1'>
+		<test name='10'>
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 			</request>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
@@ -1581,7 +1581,7 @@
 			</request>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
-				<ruri>$calendarpath2:/</ruri>
+				<ruri>$taskspath2:/</ruri>
 			</request>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/limits.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/limits.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/limits.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -76,7 +76,10 @@
 	</test-suite>
 
 	<test-suite name='Collection limit' ignore='no'>
-		<test name='1' count='48' ignore='no'>
+		<test name='1a' count='48' ignore='no'>
+			<exclude-feature>
+				<feature>split-calendars</feature>
+			</exclude-feature>
 			<description>Create collections to one below the limit</description>
 			<request end-delete='yes' print-response='no'>
 				<method>MKCALENDAR</method>
@@ -90,8 +93,25 @@
 				</verify>
 			</request>
 		</test>
+		<test name='1b' count='47' ignore='no'>
+			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>Create collections to one below the limit</description>
+			<request end-delete='yes' print-response='no'>
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/caltest-##/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>201</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 		<test name='2' ignore='no'>
-			<description>Create collections to one below the limit</description>
+			<description>Create collections to the limit</description>
 			<request print-response='no'>
 				<method>MKCALENDAR</method>
 				<ruri>$pathprefix1:/caltest-49/</ruri>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/mkcalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/mkcalendar.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/mkcalendar.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -206,6 +206,312 @@
 			</request>
 		</test>
 	</test-suite>
+
+	<test-suite name='MKCALENDAR supported-component-set'>
+		<test name='1'>
+			<description>MKCALENDAR with VEVENT only</description>
+			<request end-delete='yes'>
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/vevent-only/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/restrictions/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>201</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>PUT vevent</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$pathprefix1:/vevent-only/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/restrictions/2.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>PUT vtodo</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$pathprefix1:/vevent-only/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/restrictions/3.ics</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}supported-component</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>MKCALENDAR with VTODO only</description>
+			<request end-delete='yes'>
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/vtodo-only/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/restrictions/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>201</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>PUT vevent</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$pathprefix1:/vtodo-only/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/restrictions/5.ics</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}supported-component</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>PUT vtodo</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$pathprefix1:/vtodo-only/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/restrictions/6.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>MKCALENDAR with VEVENT and VTODO</description>
+			<request end-delete='yes'>
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/vevent-vtodo/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/restrictions/7.xml</filepath>
+				</data>
+				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>201</value>
+					</arg>
+				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>badprops</name>
+						<value>{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8' ignore='no'>
+			<exclude-feature>
+				<feature>split-calendars</feature>
+			</exclude-feature>
+			<description>PUT vevent</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$pathprefix1:/vevent-vtodo/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/restrictions/8.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='9'>
+			<exclude-feature>
+				<feature>split-calendars</feature>
+			</exclude-feature>
+			<description>PUT vtodo</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$pathprefix1:/vevent-vtodo/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/restrictions/9.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='supported-component-sets'>
+		<require-feature>
+			<feature>supported-component-sets</feature>
+		</require-feature>
+		<test name='1'>
+			<description>Check calendar home for property</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/supported-component-sets/1.xml</filepath>
+				</data>
+				<verify>
+					<exclude-feature>
+						<feature>supported-component-sets-one</feature>
+					</exclude-feature>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>{urn:ietf:params:xml:ns:caldav}supported-calendar-component-sets$</value>
+					</arg>
+				</verify>
+				<verify>
+					<require-feature>
+						<feature>supported-component-sets-one</feature>
+					</require-feature>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-sets/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VEVENT"]</value>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-sets/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VTODO"]</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Single component calendars'>
+		<require-feature>
+			<feature>split-calendars</feature>
+		</require-feature>
+		<test name='1'>
+			<description>Calendar for VEVENTs only</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$calendarpath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/single-components/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VEVENT"]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VTODO"]</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Calendar for VTODOs only</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$taskspath1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/single-components/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VTODO"]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VEVENT"]</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Simple MKCALENDAR</description>
+			<request end-delete='yes'>
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/nobody/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>201</value>
+					</arg>
+				</verify>
+			</request>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/nobody/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/mkcalendar/single-components/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VEVENT"]</value>
+					</arg>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VTODO"]</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
 	<end/>
-
+	
 </caldavtest>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -120,7 +120,7 @@
 			<description>Plain VTODO with no date</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/1todo.ics</ruri>
+				<ruri>$taskspath1:/1todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/1.txt</filepath>
@@ -131,7 +131,7 @@
 			</request>
 			<request>
 				<method>GET</method>
-				<ruri>$calendarpath1:/1todo.ics</ruri>
+				<ruri>$taskspath1:/1todo.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -145,7 +145,7 @@
 			<description>Plain VTODO with DUE only</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/2todo.ics</ruri>
+				<ruri>$taskspath1:/2todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/2.txt</filepath>
@@ -156,7 +156,7 @@
 			</request>
 			<request>
 				<method>GET</method>
-				<ruri>$calendarpath1:/2todo.ics</ruri>
+				<ruri>$taskspath1:/2todo.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -170,7 +170,7 @@
 			<description>Plain VTODO with DTSTART/DUARTION only</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/3todo.ics</ruri>
+				<ruri>$taskspath1:/3todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/3.txt</filepath>
@@ -181,7 +181,7 @@
 			</request>
 			<request>
 				<method>GET</method>
-				<ruri>$calendarpath1:/3todo.ics</ruri>
+				<ruri>$taskspath1:/3todo.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -195,7 +195,7 @@
 			<description>Plain VTODO with DTSTART only</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/4todo.ics</ruri>
+				<ruri>$taskspath1:/4todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/4.txt</filepath>
@@ -206,7 +206,7 @@
 			</request>
 			<request>
 				<method>GET</method>
-				<ruri>$calendarpath1:/4todo.ics</ruri>
+				<ruri>$taskspath1:/4todo.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -220,7 +220,7 @@
 			<description>Plain VTODO with COMPLETED only</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/5todo.ics</ruri>
+				<ruri>$taskspath1:/5todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/12.ics</filepath>
@@ -231,7 +231,7 @@
 			</request>
 			<request>
 				<method>GET</method>
-				<ruri>$calendarpath1:/5todo.ics</ruri>
+				<ruri>$taskspath1:/5todo.ics</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>
@@ -405,7 +405,7 @@
 			<description>DTSTART/DATE-TIME/UTC, DUE/DATE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/11.ics</ruri>
+				<ruri>$taskspath1:/11.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/9.ics</filepath>
@@ -419,7 +419,7 @@
 			<description>DTSTART/DATE-TIME/TZID, DUE/DATE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/20.ics</ruri>
+				<ruri>$taskspath1:/20.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/18.ics</filepath>
@@ -433,7 +433,7 @@
 			<description>DTSTART/DATE-TIME/Float, DUE/DATE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/21.ics</ruri>
+				<ruri>$taskspath1:/21.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/19.ics</filepath>
@@ -447,7 +447,7 @@
 			<description>DTSTART/DATE, DUE/DATE-TIME/UTC</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/22.ics</ruri>
+				<ruri>$taskspath1:/22.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/20.ics</filepath>
@@ -461,7 +461,7 @@
 			<description>DTSTART/DATE, DUE/DATE-TIME/TZID</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/23.ics</ruri>
+				<ruri>$taskspath1:/23.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/21.ics</filepath>
@@ -475,7 +475,7 @@
 			<description>DTSTART/DATE, DUE/DATE-TIME/Float</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/24.ics</ruri>
+				<ruri>$taskspath1:/24.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/22.ics</filepath>
@@ -489,7 +489,7 @@
 			<description>DTSTART/DATE-TIME/UTC, DUE/DATE-TIME/TZID</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/12.ics</ruri>
+				<ruri>$taskspath1:/12.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/10.ics</filepath>
@@ -503,7 +503,7 @@
 			<description>DTSTART/DATE-TIME/UTC, DUE/DATE-TIME/Float</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/13.ics</ruri>
+				<ruri>$taskspath1:/13.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/11.ics</filepath>
@@ -517,7 +517,7 @@
 			<description>DTSTART/DATE-TIME/TZID, DUE/DATE-TIME/UTC</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/14.ics</ruri>
+				<ruri>$taskspath1:/14.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/12.ics</filepath>
@@ -531,7 +531,7 @@
 			<description>DTSTART/DATE-TIME/TZID, DUE/DATE-TIME/Float</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/15.ics</ruri>
+				<ruri>$taskspath1:/15.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/13.ics</filepath>
@@ -545,7 +545,7 @@
 			<description>DTSTART/DATE-TIME/Float, DUE/DATE-TIME/UTC</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/16.ics</ruri>
+				<ruri>$taskspath1:/16.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/14.ics</filepath>
@@ -559,7 +559,7 @@
 			<description>DTSTART/DATE-TIME/Float, DUE/DATE-TIME/TZID</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/17.ics</ruri>
+				<ruri>$taskspath1:/17.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/problemics/15.ics</filepath>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/recurrenceput.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/recurrenceput.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/recurrenceput.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -148,7 +148,7 @@
 			<description>Plain VTODO with no date - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/1todo.ics</ruri>
+				<ruri>$taskspath1:/1todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/5.txt</filepath>
@@ -162,7 +162,7 @@
 			<description>Plain VTODO with all-day DUE only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/2todo.ics</ruri>
+				<ruri>$taskspath1:/2todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/6.txt</filepath>
@@ -176,7 +176,7 @@
 			<description>Plain VTODO with all-day DTSTART/DURATION only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/3todo.ics</ruri>
+				<ruri>$taskspath1:/3todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/7.txt</filepath>
@@ -190,7 +190,7 @@
 			<description>Plain VTODO with all-day DTSTART only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/3todo.ics</ruri>
+				<ruri>$taskspath1:/3todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/8.txt</filepath>
@@ -204,7 +204,7 @@
 			<description>Plain VTODO with timed DUE only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/4todo.ics</ruri>
+				<ruri>$taskspath1:/4todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/9.txt</filepath>
@@ -218,7 +218,7 @@
 			<description>Plain VTODO with timed DTSTART/DURATION only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/5todo.ics</ruri>
+				<ruri>$taskspath1:/5todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/10.txt</filepath>
@@ -232,7 +232,7 @@
 			<description>Plain VTODO with timed DTSTART/DURATION only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/5todo.ics</ruri>
+				<ruri>$taskspath1:/5todo.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/todo/11.txt</filepath>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -137,6 +137,9 @@
 			</data>
 		</request>
 		<request end-delete="yes">
+			<exclude-feature>
+				<feature>split-calendars</feature>
+			</exclude-feature>
 			<method>PUT</method>
 			<ruri>$calendarpath1:/15.ics</ruri>
 			<data>
@@ -186,7 +189,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/101.ics</ruri>
+			<ruri>$taskspath1:/101.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/101.txt</filepath>
@@ -194,7 +197,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/102.ics</ruri>
+			<ruri>$taskspath1:/102.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/102.txt</filepath>
@@ -202,7 +205,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/103.ics</ruri>
+			<ruri>$taskspath1:/103.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/103.txt</filepath>
@@ -210,7 +213,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/104.ics</ruri>
+			<ruri>$taskspath1:/104.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/104.txt</filepath>
@@ -218,7 +221,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/105.ics</ruri>
+			<ruri>$taskspath1:/105.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/105.txt</filepath>
@@ -226,7 +229,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/106.ics</ruri>
+			<ruri>$taskspath1:/106.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/106.txt</filepath>
@@ -255,7 +258,7 @@
 	</test-suite>
 
 	<test-suite name='multiget reports' ignore='no'>
-		<test name='1' ignore='no'>
+		<test name='1a' ignore='no'>
 			<description>basic multiget of 4 resources returning etag and entire ics data</description>
 			<request>
 				<method>REPORT</method>
@@ -265,6 +268,9 @@
 					<filepath>Resource/CalDAV/reports/multiget/1.txt</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -276,8 +282,55 @@
 						<value>102.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+						<value>2.ics</value>
+						<value>3.ics</value>
+						<value>4.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
+		<test name='1b' ignore='no'>
+			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>basic multiget of 4 resources returning etag and entire ics data</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/multiget/1b.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>badhrefs</name>
+						<value>1.ics</value>
+						<value>2.ics</value>
+						<value>3.ics</value>
+						<value>4.ics</value>
+					</arg>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 		<test name='2' ignore='no'>
 			<description>basic multiget of 4 resources returning etag and only VCALENDAR property data (no embedded components)</description>
 			<request>
@@ -320,7 +373,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4a' ignore='no'>
 			<description>basic multiget of 4 resources returning etag and only SUMMARY/UID properties inside VEVENT components and VALARMs</description>
 			<request>
 				<method>REPORT</method>
@@ -330,6 +383,9 @@
 					<filepath>Resource/CalDAV/reports/multiget/4.txt</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -341,9 +397,56 @@
 						<value>102.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+						<value>2.ics</value>
+						<value>3.ics</value>
+						<value>4.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='4b' ignore='no'>
+			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>basic multiget of 4 resources returning etag and only SUMMARY/UID properties inside VEVENT components and VALARMs</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/multiget/4b.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>badhrefs</name>
+						<value>1.ics</value>
+						<value>2.ics</value>
+						<value>3.ics</value>
+						<value>4.ics</value>
+					</arg>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5a' ignore='no'>
 			<description>as 4.txt except that the SUMMARY property value is not returned</description>
 			<request>
 				<method>REPORT</method>
@@ -353,6 +456,9 @@
 					<filepath>Resource/CalDAV/reports/multiget/5.txt</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -364,8 +470,55 @@
 						<value>102.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+						<value>2.ics</value>
+						<value>3.ics</value>
+						<value>4.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
+		<test name='5b' ignore='no'>
+			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>as 4.txt except that the SUMMARY property value is not returned</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data substitutions='yes'>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/multiget/5b.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>badhrefs</name>
+						<value>1.ics</value>
+						<value>2.ics</value>
+						<value>3.ics</value>
+						<value>4.ics</value>
+					</arg>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 		<test name='6' ignore='no'>
 			<description>Does allprop</description>
 			<request>
@@ -436,7 +589,7 @@
 	</test-suite>
 	
 	<test-suite name='basic query reports' ignore='no'>
-		<test name='1' ignore='no'>
+		<test name='1a' ignore='no'>
 			<description>query for resources with VCALENDAR & VEVENT defined</description>
 			<request>
 				<method>REPORT</method>
@@ -472,7 +625,27 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='1b' ignore='no'>
+			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for resources with VCALENDAR & VEVENT defined</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/1.txt</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2a' ignore='no'>
 			<description>query for resources with VCALENDAR & VEVENT not defined</description>
 			<request>
 				<method>REPORT</method>
@@ -482,6 +655,9 @@
 					<filepath>Resource/CalDAV/reports/basicquery/8.txt</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -494,8 +670,43 @@
 						<value>106.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+					</arg>
+				</verify>
 			</request>
 		</test>
+		<test name='2b' ignore='no'>
+			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for resources with VCALENDAR & VEVENT not defined</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/8.txt</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+						<value>103.ics</value>
+						<value>104.ics</value>
+						<value>105.ics</value>
+						<value>106.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 		<test name='3' ignore='no'>
 			<description>query for resources where the SUMMARY in a VEVENT contains the character '1'</description>
 			<request>
@@ -770,7 +981,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14a' ignore='no'>
 			<description>query for resources with VCALENDAR & VTODO defined</description>
 			<request>
 				<method>REPORT</method>
@@ -780,6 +991,9 @@
 					<filepath>Resource/CalDAV/reports/basicquery/101.txt</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -791,13 +1005,48 @@
 						<value>106.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+					</arg>
+				</verify>
 			</request>
 		</test>
+		<test name='14b' ignore='no'>
+			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for resources with VCALENDAR & VTODO defined</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/101.txt</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+						<value>103.ics</value>
+						<value>104.ics</value>
+						<value>105.ics</value>
+						<value>106.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 		<test name='15' ignore='no'>
 			<description>query for resources where the SUMMARY in a VTODO contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/102.txt</filepath>
@@ -815,7 +1064,7 @@
 			<description>query for resources that have a DUE in a VTODO that contains a TZID parameter containing the text 'East'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/103.txt</filepath>
@@ -831,7 +1080,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17' ignore='no'>
+		<test name='17a' ignore='no'>
 			<description>query for resources with VCALENDAR & VEVENT and VTODO defined</description>
 			<request>
 				<method>REPORT</method>
@@ -848,8 +1097,28 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='17b' ignore='no'>
 			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for resources with VCALENDAR & VEVENT and VTODO defined</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/201.txt</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='18a' ignore='no'>
+			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
 			<description>query for resources with VCALENDAR & VEVENT or VTODO defined</description>
@@ -861,6 +1130,9 @@
 					<filepath>Resource/CalDAV/reports/basicquery/204.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -891,9 +1163,64 @@
 						<value>106.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+						<value>2.ics</value>
+						<value>3.ics</value>
+						<value>4.ics</value>
+						<value>5.ics</value>
+						<value>6.ics</value>
+						<value>7.ics</value>
+						<value>8.ics</value>
+						<value>9.ics</value>
+						<value>10.ics</value>
+						<value>11.ics</value>
+						<value>12.ics</value>
+						<value>13.ics</value>
+						<value>14.ics</value>
+						<value>18.ics</value>
+						<value>19.ics</value>
+						<value>20.ics</value>
+						<value>21.ics</value>
+						<value>22.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
-		<test name='19' ignore='no'>
+		<test name='18b' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for resources with VCALENDAR & VEVENT or VTODO defined</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/204.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+						<value>103.ics</value>
+						<value>104.ics</value>
+						<value>105.ics</value>
+						<value>106.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='19a' ignore='no'>
 			<description>query for resources where the SUMMARY in a VEVENT and VTODO contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
@@ -910,8 +1237,28 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20' ignore='no'>
+		<test name='19b' ignore='no'>
 			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for resources where the SUMMARY in a VEVENT and VTODO contains the character '1'</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/202.txt</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='20a' ignore='no'>
+			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
 			<description>query for resources where the SUMMARY in a VEVENT or VTODO contains the character '1'</description>
@@ -923,6 +1270,9 @@
 					<filepath>Resource/CalDAV/reports/basicquery/205.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -938,13 +1288,53 @@
 						<value>101.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+						<value>10.ics</value>
+						<value>11.ics</value>
+						<value>12.ics</value>
+						<value>13.ics</value>
+						<value>14.ics</value>
+						<value>18.ics</value>
+						<value>20.ics</value>
+						<value>21.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
+		<test name='20b' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for resources where the SUMMARY in a VEVENT or VTODO contains the character '1'</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/205.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 		<test name='21' ignore='no'>
 			<description>query for resources that have a DTSTART in a VEVENT with TZID containg 'Paci' and a DUE in a VTODO with TZID containing 'East'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/203.txt</filepath>
@@ -957,7 +1347,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22' ignore='no'>
+		<test name='22a' ignore='no'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -970,6 +1360,9 @@
 					<filepath>Resource/CalDAV/reports/basicquery/206.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -979,8 +1372,42 @@
 						<value>106.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>3.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
+		<test name='22b' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for resources that have a DTSTART in a VEVENT with TZID containg 'Paci' or a DUE in a VTODO with TZID containing 'East'</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/206.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>102.ics</value>
+						<value>104.ics</value>
+						<value>106.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 		<test name='23' ignore='no'>
 			<description>query for VEVENTs that do not contain VALARMs</description>
 			<request>
@@ -1365,6 +1792,9 @@
 					<filepath>Resource/CalDAV/reports/timerangequery/14.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -1382,6 +1812,26 @@
 						<value>15.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+						<value>2.ics</value>
+						<value>3.ics</value>
+						<value>4.ics</value>
+						<value>8.ics</value>
+						<value>9.ics</value>
+						<value>10.ics</value>
+						<value>11.ics</value>
+						<value>12.ics</value>
+						<value>13.ics</value>
+						<value>14.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='4' ignore='no'>
@@ -1474,7 +1924,7 @@
 			<description>query for VTODOs within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/101.txt</filepath>
@@ -1494,7 +1944,7 @@
 			<description>query for VTODOs within time range with specific SUMMARY text</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/102.txt</filepath>
@@ -1512,7 +1962,7 @@
 			<description>query for VTODO recurrence instance within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/103.txt</filepath>
@@ -1687,7 +2137,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19' ignore='no'>
+		<test name='19a' ignore='no'>
 			<description>query for VEVENTS and VTODOs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1704,8 +2154,28 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20' ignore='no'>
+		<test name='19b' ignore='no'>
 			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for VEVENTS and VTODOs within time range</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/201.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='20a' ignore='no'>
+			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
 			<description>query for VEVENTS or VTODOs within time range</description>
@@ -1717,6 +2187,9 @@
 					<filepath>Resource/CalDAV/reports/timerangequery/204.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -1729,9 +2202,46 @@
 						<value>103.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>5.ics</value>
+						<value>6.ics</value>
+						<value>7.ics</value>
+						<value>19.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
-		<test name='21' ignore='no'>
+		<test name='20b' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for VEVENTS or VTODOs within time range</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/204.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+						<value>103.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='21a' ignore='no'>
 			<description>query for VEVENTS and VTODOs with start only</description>
 			<request>
 				<method>REPORT</method>
@@ -1748,8 +2258,28 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22' ignore='no'>
+		<test name='21b' ignore='no'>
 			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for VEVENTS and VTODOs with start only</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/202.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='22a' ignore='no'>
+			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
 			<description>query for VEVENTS or VTODOs with start only</description>
@@ -1761,6 +2291,9 @@
 					<filepath>Resource/CalDAV/reports/timerangequery/205.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -1786,9 +2319,59 @@
 						<value>106.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>5.ics</value>
+						<value>6.ics</value>
+						<value>7.ics</value>
+						<value>8.ics</value>
+						<value>9.ics</value>
+						<value>10.ics</value>
+						<value>11.ics</value>
+						<value>12.ics</value>
+						<value>13.ics</value>
+						<value>14.ics</value>
+						<value>18.ics</value>
+						<value>19.ics</value>
+						<value>20.ics</value>
+						<value>21.ics</value>
+						<value>22.ics</value>
+						<value>23.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
-		<test name='23' ignore='no'>
+		<test name='22b' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for VEVENTS or VTODOs with start only</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/205.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+						<value>104.ics</value>
+						<value>105.ics</value>
+						<value>106.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='23a' ignore='no'>
 			<description>query for VEVENTS with start only and all VTODOs</description>
 			<request>
 				<method>REPORT</method>
@@ -1805,8 +2388,28 @@
 				</verify>
 			</request>
 		</test>
-		<test name='24' ignore='no'>
+		<test name='23b' ignore='no'>
 			<require-feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for VEVENTS with start only and all VTODOs</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/203.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='24a' ignore='no'>
+			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
 			<description>query for VEVENTS with start only or all VTODOs</description>
@@ -1818,6 +2421,9 @@
 					<filepath>Resource/CalDAV/reports/timerangequery/206.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -1845,8 +2451,60 @@
 						<value>106.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>5.ics</value>
+						<value>6.ics</value>
+						<value>7.ics</value>
+						<value>8.ics</value>
+						<value>9.ics</value>
+						<value>10.ics</value>
+						<value>11.ics</value>
+						<value>12.ics</value>
+						<value>13.ics</value>
+						<value>14.ics</value>
+						<value>18.ics</value>
+						<value>19.ics</value>
+						<value>20.ics</value>
+						<value>21.ics</value>
+						<value>22.ics</value>
+						<value>23.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
+		<test name='24b' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+				<feature>split-calendars</feature>
+			</require-feature>
+			<description>query for VEVENTS with start only or all VTODOs</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$taskspath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/timerangequery/206.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>101.ics</value>
+						<value>102.ics</value>
+						<value>103.ics</value>
+						<value>104.ics</value>
+						<value>105.ics</value>
+						<value>106.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
 	<test-suite name='alarm time-range query reports' ignore='no'>
@@ -1928,7 +2586,7 @@
 			<description>query for VALARMS on VTODO within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$taskspath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/alarmtimerangequery/5.txt</filepath>
@@ -1991,6 +2649,9 @@
 					<filepath>Resource/CalDAV/reports/freebusy/2.txt</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
@@ -2009,6 +2670,22 @@
 						<value>20060108T210000Z/20060108T213000Z</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>freeBusy</callback>
+					<arg>
+						<name>busy</name>
+						<value>20060107T010000Z/20060107T020000Z</value>
+						<value>20060107T150000Z/20060107T163000Z</value>
+						<value>20060108T150000Z/20060108T170000Z</value>
+					</arg>
+					<arg>
+						<name>tentative</name>
+						<value>20060108T160000Z/20060108T170000Z</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 	</test-suite>
@@ -2106,12 +2783,24 @@
 					<filepath>Resource/CalDAV/reports/limitexpand/5.txt</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
 						<value>15.ics</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='6' ignore='no'>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -124,12 +124,25 @@
 					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
 						<value>7</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>8</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='5' ignore='no'>
@@ -217,12 +230,25 @@
 					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
 						<value>8</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>9</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='5' ignore='no'>
@@ -296,12 +322,25 @@
 					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
 						<value>7</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>8</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='5' ignore='no'>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -240,6 +240,9 @@
 					<filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -255,6 +258,26 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>shared/</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 				<grabelement>
 					<name>/{DAV:}multistatus/{DAV:}sync-token</name>
 					<variable>$synctoken1:</variable>
@@ -275,6 +298,9 @@
 					<filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -289,6 +315,25 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 				<grabelement>
 					<name>/{DAV:}multistatus/{DAV:}sync-token</name>
 					<variable>$synctoken2:</variable>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml	2011-11-29 03:25:36 UTC (rev 8348)
@@ -233,6 +233,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -249,6 +252,27 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar1/</value>
+						<value>synccalendar2/</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='3' ignore='no'>
@@ -265,6 +289,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -285,6 +312,31 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar1/</value>
+						<value>synccalendar1/1.ics</value>
+						<value>synccalendar1/2.ics</value>
+						<value>synccalendar2/</value>
+						<value>synccalendar2/1.ics</value>
+						<value>synccalendar2/2.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='4' ignore='no'>
@@ -339,6 +391,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -355,6 +410,27 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar1/</value>
+						<value>synccalendar2/</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='7' ignore='no'>
@@ -371,6 +447,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -392,6 +471,32 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar1/</value>
+						<value>synccalendar1/1.ics</value>
+						<value>synccalendar1/2.ics</value>
+						<value>synccalendar1/3.ics</value>
+						<value>synccalendar2/</value>
+						<value>synccalendar2/1.ics</value>
+						<value>synccalendar2/2.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='8' ignore='no'>
@@ -441,6 +546,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -457,6 +565,27 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar1/</value>
+						<value>synccalendar2/</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='11' ignore='no'>
@@ -473,6 +602,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -493,6 +625,31 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar1/</value>
+						<value>synccalendar1/1.ics</value>
+						<value>synccalendar1/2.ics</value>
+						<value>synccalendar2/</value>
+						<value>synccalendar2/1.ics</value>
+						<value>synccalendar2/2.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='12' ignore='no'>
@@ -546,6 +703,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -562,6 +722,27 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar1/</value>
+						<value>synccalendar2/</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='15' ignore='no'>
@@ -578,6 +759,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -598,6 +782,31 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar1/</value>
+						<value>synccalendar1/1.ics</value>
+						<value>synccalendar1/2.ics</value>
+						<value>synccalendar2/</value>
+						<value>synccalendar2/1.ics</value>
+						<value>synccalendar2/2.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 	</test-suite>
@@ -1222,6 +1431,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -1242,6 +1454,31 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar3/</value>
+						<value>synccalendar3/1.ics</value>
+						<value>synccalendar3/2.ics</value>
+						<value>synccalendar4/</value>
+						<value>synccalendar4/1.ics</value>
+						<value>synccalendar4/2.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 				<grabelement>
 					<name>/{DAV:}multistatus/{DAV:}sync-token</name>
 					<variable>$synctoken1:</variable>
@@ -1416,6 +1653,9 @@
 					<filepath>Resource/CalDAV/reports/sync/5.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -1437,6 +1677,31 @@
 					</arg>
 				</verify>
 				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar3/</value>
+						<value>synccalendar3/1.ics</value>
+						<value>synccalendar3/2.ics</value>
+						<value>synccalendar4/</value>
+						<value>synccalendar4/1.ics</value>
+						<value>synccalendar4/2.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
+				<verify>
 					<callback>propfindItems</callback>
 					<arg>
 						<name>ignore</name>
@@ -1652,6 +1917,9 @@
 					<filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>split-calendars</feature>
+					</exclude-feature>
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
@@ -1672,6 +1940,31 @@
 						<value>$dropbox:/</value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>split-calendars</feature>
+					</require-feature>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$calendar:/</value>
+						<value>$tasks:/</value>
+						<value>$inbox:/</value>
+						<value>$outbox:/</value>
+						<value>$freebusy:</value>
+						<value>$notification:/</value>
+						<value>synccalendar3/</value>
+						<value>synccalendar3/1.ics</value>
+						<value>synccalendar3/2.ics</value>
+						<value>synccalendar4/</value>
+						<value>synccalendar4/1.ics</value>
+						<value>synccalendar4/2.ics</value>
+					</arg>
+					<arg>
+						<name>badhrefs</name>
+						<value>$dropbox:/</value>
+					</arg>
+				</verify>
 				<grabelement>
 					<name>/{DAV:}multistatus/{DAV:}sync-token</name>
 					<variable>$synctoken1:</variable>

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/src/caldavtest.py	2011-11-29 03:25:36 UTC (rev 8348)
@@ -617,6 +617,10 @@
             result = True
             resulttxt = ""
             for verifier in req.verifiers:
+                if len(verifier.missingFeatures()) != 0:
+                    continue
+                if len(verifier.excludedFeatures()) != 0:
+                    continue
                 iresult, iresulttxt = verifier.doVerify(uri, response, respdata)
                 if not iresult:
                     result = False

Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/src/request.py	2011-11-29 03:25:36 UTC (rev 8348)
@@ -427,9 +427,17 @@
     
     def __init__( self, manager ):
         self.manager = manager
+        self.require_features = set()
+        self.exclude_features = set()
         self.callback = None
         self.args = {}
     
+    def missingFeatures(self):
+        return self.require_features - self.manager.server_info.features
+
+    def excludedFeatures(self):
+        return self.exclude_features & self.manager.server_info.features
+
     def doVerify(self, uri, response, respdata):
         
         # Re-do substitutions from values generated during the current test run
@@ -452,11 +460,20 @@
     def parseXML( self, node ):
 
         for child in node.getchildren():
-            if child.tag == src.xmlDefs.ELEMENT_CALLBACK:
+            if child.tag == src.xmlDefs.ELEMENT_REQUIRE_FEATURE:
+                self.parseFeatures( child, require=True )
+            elif child.tag == src.xmlDefs.ELEMENT_EXCLUDE_FEATURE:
+                self.parseFeatures( child, require=False )
+            elif child.tag == src.xmlDefs.ELEMENT_CALLBACK:
                 self.callback = child.text.encode("utf-8")
             elif child.tag == src.xmlDefs.ELEMENT_ARG:
                 self.parseArgXML(child)
 
+    def parseFeatures(self, node, require=True):
+        for child in node.getchildren():
+            if child.tag == src.xmlDefs.ELEMENT_FEATURE:
+                (self.require_features if require else self.exclude_features).add(child.text.encode("utf-8"))
+
     def parseArgXML(self, node):
         name = None
         values = []

Modified: CalDAVTester/trunk/verifiers/xmlElementMatch.py
===================================================================
--- CalDAVTester/trunk/verifiers/xmlElementMatch.py	2011-11-28 22:12:12 UTC (rev 8347)
+++ CalDAVTester/trunk/verifiers/xmlElementMatch.py	2011-11-29 03:25:36 UTC (rev 8348)
@@ -101,10 +101,10 @@
                                 if node.text == test[1:]:
                                     result = "        Incorrect value returned in XML for %s\n" % (path,)
                             elif test[0] == '*':
-                                if node.text.find(test[1:]) == -1:
+                                if node.text is None or node.text.find(test[1:]) == -1:
                                     result = "        Incorrect value returned in XML for %s\n" % (path,)
                             elif test[0] == '+':
-                                if not node.text.startswith(test[1:]):
+                                if node.text is None or not node.text.startswith(test[1:]):
                                     result = "        Incorrect value returned in XML for %s\n" % (path,)
                             return result
                         
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111128/44e8fcee/attachment-0001.html>


More information about the calendarserver-changes mailing list