[CalendarServer-changes] [8224] CalDAVTester/branches/users/cdaboo/component-set-fixes

source_changes at macosforge.org source_changes at macosforge.org
Tue Oct 25 12:43:28 PDT 2011


Revision: 8224
          http://trac.macosforge.org/projects/calendarserver/changeset/8224
Author:   cdaboo at apple.com
Date:     2011-10-25 12:43:28 -0700 (Tue, 25 Oct 2011)
Log Message:
-----------
Tests for calendars created with restricted sets of components.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/acls/17.ics
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1.txt
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/2.txt
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/3.txt
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4.txt
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5.txt
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/6.txt
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/7.txt
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/8.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/doubleencoded1.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/encoded1.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-template.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/sslserverinfo.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/acl.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/attachments.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/availability.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/caldavtest.dtd
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/delete.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/encodedURIs.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/implicittodo.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/limits.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/mkcalendar.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/put.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/recurrenceput.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/reports.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sharing-multiple.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sharing-notification-sync.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sync-report.xml

Added Paths:
-----------
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/doubleencoded1.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/encoded1.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/1.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/2.ics
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/3.ics
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/4.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/5.ics
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/6.ics
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/7.xml
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/8.ics
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/9.ics
    CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/Common/MKCALENDAR/AllComponents.xml

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/acls/17.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/acls/17.ics	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/acls/17.ics	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/doubleencoded1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/doubleencoded1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/doubleencoded1.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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>

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/encoded1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/encoded1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/encodedURIs/encoded1.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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>

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/1.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/1.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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>

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/2.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/2.ics	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/3.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/3.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/3.ics	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/4.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/4.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/4.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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>

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/5.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/5.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/5.ics	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/6.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/6.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/6.ics	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/7.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/7.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/7.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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>

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/8.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/8.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/8.ics	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/9.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/9.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/restrictions/9.ics	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1.txt	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1.txt	2011-10-25 19:43:28 UTC (rev 8224)
@@ -9,10 +9,10 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$pathprefix1:/calendar/1.ics</D:href>
-<D:href>$pathprefix1:/calendar/2.ics</D:href>
-<D:href>$pathprefix1:/calendar/3.ics</D:href>
-<D:href>$pathprefix1:/calendar/4.ics</D:href>
-<D:href>$pathprefix1:/calendar/101.ics</D:href>
-<D:href>$pathprefix1:/calendar/102.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/101.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/102.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/2.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/2.txt	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/2.txt	2011-10-25 19:43:28 UTC (rev 8224)
@@ -8,8 +8,8 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$pathprefix1:/calendar/1.ics</D:href>
-<D:href>$pathprefix1:/calendar/2.ics</D:href>
-<D:href>$pathprefix1:/calendar/3.ics</D:href>
-<D:href>$pathprefix1:/calendar/4.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/3.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/3.txt	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/3.txt	2011-10-25 19:43:28 UTC (rev 8224)
@@ -12,8 +12,8 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$pathprefix1:/calendar/1.ics</D:href>
-<D:href>$pathprefix1:/calendar/2.ics</D:href>
-<D:href>$pathprefix1:/calendar/3.ics</D:href>
-<D:href>$pathprefix1:/calendar/4.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4.txt	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4.txt	2011-10-25 19:43:28 UTC (rev 8224)
@@ -13,10 +13,10 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$pathprefix1:/calendar/1.ics</D:href>
-<D:href>$pathprefix1:/calendar/2.ics</D:href>
-<D:href>$pathprefix1:/calendar/3.ics</D:href>
-<D:href>$pathprefix1:/calendar/4.ics</D:href>
-<D:href>$pathprefix1:/calendar/101.ics</D:href>
-<D:href>$pathprefix1:/calendar/102.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/101.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/102.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5.txt	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5.txt	2011-10-25 19:43:28 UTC (rev 8224)
@@ -13,10 +13,10 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$pathprefix1:/calendar/1.ics</D:href>
-<D:href>$pathprefix1:/calendar/2.ics</D:href>
-<D:href>$pathprefix1:/calendar/3.ics</D:href>
-<D:href>$pathprefix1:/calendar/4.ics</D:href>
-<D:href>$pathprefix1:/calendar/101.ics</D:href>
-<D:href>$pathprefix1:/calendar/102.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/101.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/102.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/6.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/6.txt	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/6.txt	2011-10-25 19:43:28 UTC (rev 8224)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:allprop/>
-<D:href>$pathprefix1:/calendar/1.ics</D:href>
-<D:href>$pathprefix1:/calendar/2.ics</D:href>
-<D:href>$pathprefix1:/calendar/3.ics</D:href>
-<D:href>$pathprefix1:/calendar/4.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/7.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/7.txt	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/7.txt	2011-10-25 19:43:28 UTC (rev 8224)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:propname/>
-<D:href>$pathprefix1:/calendar/1.ics</D:href>
-<D:href>$pathprefix1:/calendar/2.ics</D:href>
-<D:href>$pathprefix1:/calendar/3.ics</D:href>
-<D:href>$pathprefix1:/calendar/4.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/8.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/8.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/8.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:propname/>
-<D:href>$pathprefix1:/calendar/bogus-resource.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/bogus-resource.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/doubleencoded1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/doubleencoded1.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/doubleencoded1.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -9,5 +9,5 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$calendarpath1:/3%2520a.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/3%2520a.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/encoded1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/encoded1.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/encoded1.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -9,5 +9,5 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$calendarpath1:/2%20a.ics</D:href>
+<D:href>$pathprefix1:/allcomponents/2%20a.ics</D:href>
 </C:calendar-multiget>

Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/Common/MKCALENDAR/AllComponents.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/Common/MKCALENDAR/AllComponents.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/Common/MKCALENDAR/AllComponents.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-partitioning.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-partitioning.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -69,6 +69,7 @@
 		<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>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 +214,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 +409,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 +454,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/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-template.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-template.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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,7 @@
 		<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>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 +214,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 +423,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/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -69,6 +69,7 @@
 		<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>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 +214,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 +424,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/branches/users/cdaboo/component-set-fixes/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/sslserverinfo.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/sslserverinfo.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -70,6 +70,7 @@
 		<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>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 +215,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 +410,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 +455,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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/acl.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/acl.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/acl.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/attachments.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/attachments.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/attachments.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/availability.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/availability.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/availability.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/caldavtest.dtd	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/caldavtest.dtd	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/delete.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/delete.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/delete.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/encodedURIs.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/encodedURIs.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/encodedURIs.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/implicittodo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/implicittodo.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/implicittodo.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/limits.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/limits.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/limits.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/mkcalendar.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/mkcalendar.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/mkcalendar.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -206,6 +206,156 @@
 			</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 VTODO only</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>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>201</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8' ignore='no'>
+			<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'>
+			<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>
+
 	<end/>
-
+	
 </caldavtest>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/put.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/put.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/recurrenceput.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/recurrenceput.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/recurrenceput.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/reports.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/reports.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -25,8 +25,16 @@
 
 	<start>
 		<request end-delete="yes">
+			<method>MKCALENDAR</method>
+			<ruri>$pathprefix1:/allcomponents/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/Common/MKCALENDAR/AllComponents.xml</filepath>
+			</data>
+		</request>
+		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/1.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/1.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/1.txt</filepath>
@@ -34,7 +42,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/2.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/2.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/2.txt</filepath>
@@ -42,7 +50,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/3.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/3.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/3.txt</filepath>
@@ -50,7 +58,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/4.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/4.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/4.txt</filepath>
@@ -58,7 +66,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/5.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/5.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/5.txt</filepath>
@@ -66,7 +74,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/6.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/6.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/6.txt</filepath>
@@ -74,7 +82,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/7.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/7.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/7.txt</filepath>
@@ -82,7 +90,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/8.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/8.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/8.txt</filepath>
@@ -90,7 +98,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/9.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/9.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/9.txt</filepath>
@@ -98,7 +106,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/10.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/10.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/10.txt</filepath>
@@ -106,7 +114,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/11.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/11.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/11.txt</filepath>
@@ -114,7 +122,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/12.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/12.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/12.txt</filepath>
@@ -122,7 +130,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/13.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/13.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/13.txt</filepath>
@@ -130,7 +138,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/14.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/14.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/14.txt</filepath>
@@ -138,7 +146,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/15.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/15.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/15.txt</filepath>
@@ -146,7 +154,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/18.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/18.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/18.txt</filepath>
@@ -154,7 +162,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/19.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/19.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/19.txt</filepath>
@@ -162,7 +170,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/20.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/20.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/20.txt</filepath>
@@ -170,7 +178,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/21.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/21.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/21.txt</filepath>
@@ -178,7 +186,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/22.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/22.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/22.txt</filepath>
@@ -186,7 +194,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/101.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/101.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/101.txt</filepath>
@@ -194,7 +202,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/102.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/102.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/102.txt</filepath>
@@ -202,7 +210,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/103.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/103.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/103.txt</filepath>
@@ -210,7 +218,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/104.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/104.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/104.txt</filepath>
@@ -218,7 +226,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/105.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/105.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/105.txt</filepath>
@@ -226,7 +234,7 @@
 		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
-			<ruri>$calendarpath1:/106.ics</ruri>
+			<ruri>$pathprefix1:/allcomponents/106.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/reports/put/106.txt</filepath>
@@ -242,7 +250,7 @@
 			<description>Look for options header tag</description>
 			<request print-response="no">
 				<method>OPTIONS</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<verify>
 					<callback>header</callback>
 					<arg>
@@ -259,7 +267,7 @@
 			<description>basic multiget of 4 resources returning etag and entire ics data</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data substitutions='yes'>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/1.txt</filepath>
@@ -282,7 +290,7 @@
 			<description>basic multiget of 4 resources returning etag and only VCALENDAR property data (no embedded components)</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data substitutions='yes'>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/2.txt</filepath>
@@ -303,7 +311,7 @@
 			<description>basic multiget of 4 resources returning etag and only VTIMEZONE components</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data substitutions='yes'>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/3.txt</filepath>
@@ -324,7 +332,7 @@
 			<description>basic multiget of 4 resources returning etag and only SUMMARY/UID properties inside VEVENT components and VALARMs</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data substitutions='yes'>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/4.txt</filepath>
@@ -347,7 +355,7 @@
 			<description>as 4.txt except that the SUMMARY property value is not returned</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data substitutions='yes'>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/5.txt</filepath>
@@ -370,7 +378,7 @@
 			<description>Does allprop</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data substitutions='yes'>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/6.txt</filepath>
@@ -391,7 +399,7 @@
 			<description>Does propname</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data substitutions='yes'>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/7.txt</filepath>
@@ -412,7 +420,7 @@
 			<description>Single non-existent query</description>
 			<request print-response="no">
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data substitutions='yes'>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/8.xml</filepath>
@@ -440,7 +448,7 @@
 			<description>query for resources with VCALENDAR & VEVENT defined</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/1.txt</filepath>
@@ -476,7 +484,7 @@
 			<description>query for resources with VCALENDAR & VEVENT not defined</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/8.txt</filepath>
@@ -500,7 +508,7 @@
 			<description>query for resources where the SUMMARY in a VEVENT contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/2.txt</filepath>
@@ -526,7 +534,7 @@
 			<description>query for resources where the SUMMARY in a VEVENT does not contain the character '1'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/7.txt</filepath>
@@ -553,7 +561,7 @@
 			<description>query for resources where the DESCRIPTION property exists in a VEVENT</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/3.txt</filepath>
@@ -573,7 +581,7 @@
 			<description>query for resources where the DESCRIPTION property does not exist in a VEVENT</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/9.txt</filepath>
@@ -608,7 +616,7 @@
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/4.txt</filepath>
@@ -626,7 +634,7 @@
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter not containing the text 'Paci'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/10.txt</filepath>
@@ -660,7 +668,7 @@
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci' and 'Moun'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/5.txt</filepath>
@@ -680,7 +688,7 @@
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci' or 'Moun'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/16.xml</filepath>
@@ -699,7 +707,7 @@
 			<description>query for resources where the SUMMARY in a VEVENT contains the character '4' and has a DTSTART in a VEVENT that contains a TZID parameter containing the text 'East'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/6.txt</filepath>
@@ -721,7 +729,7 @@
 			<description>query for resources where the SUMMARY in a VEVENT contains the character '4' or has a DTSTART in a VEVENT that contains a TZID parameter containing the text 'East'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/17.xml</filepath>
@@ -755,7 +763,7 @@
 			<description>query for resources where the RECURRENCE-ID in a VEVENT does not contain a RANGE parameter</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/11.txt</filepath>
@@ -774,7 +782,7 @@
 			<description>query for resources with VCALENDAR & VTODO defined</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/101.txt</filepath>
@@ -797,7 +805,7 @@
 			<description>query for resources where the SUMMARY in a VTODO contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/102.txt</filepath>
@@ -815,7 +823,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>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/103.txt</filepath>
@@ -835,7 +843,7 @@
 			<description>query for resources with VCALENDAR & VEVENT and VTODO defined</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/201.txt</filepath>
@@ -855,7 +863,7 @@
 			<description>query for resources with VCALENDAR & VEVENT or VTODO defined</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/204.xml</filepath>
@@ -897,7 +905,7 @@
 			<description>query for resources where the SUMMARY in a VEVENT and VTODO contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/202.txt</filepath>
@@ -917,7 +925,7 @@
 			<description>query for resources where the SUMMARY in a VEVENT or VTODO contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/205.xml</filepath>
@@ -944,7 +952,7 @@
 			<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>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/203.txt</filepath>
@@ -964,7 +972,7 @@
 			<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>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/206.xml</filepath>
@@ -985,7 +993,7 @@
 			<description>query for VEVENTs that do not contain VALARMs</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/12.txt</filepath>
@@ -1019,7 +1027,7 @@
 			<description>query for VEVENTs that contain a CATEGORY and filter by CATEGORY</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/13.txt</filepath>
@@ -1041,7 +1049,7 @@
 			<description>query for VEVENTs that contain a CATEGORY but test with uppercase string</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/14.txt</filepath>
@@ -1063,7 +1071,7 @@
 			<description>empty query</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/15.xml</filepath>
@@ -1080,7 +1088,7 @@
 			<description>query for VEVENTs that contain a UID starts with</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/18.xml</filepath>
@@ -1101,7 +1109,7 @@
 			<description>query for VEVENTs that contain a UID ends with</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/19.xml</filepath>
@@ -1122,7 +1130,7 @@
 			<description>query for VEVENTs that contain a UID equals</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/20.xml</filepath>
@@ -1143,7 +1151,7 @@
 			<description>query for VEVENTs that contain a UID contains</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/21.xml</filepath>
@@ -1170,7 +1178,7 @@
 			<description>query for VEVENTs that contain a SUMMARY starts with</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/22.xml</filepath>
@@ -1199,7 +1207,7 @@
 			<description>query for VEVENTs that contain a SUMMARY ends with</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/23.xml</filepath>
@@ -1222,7 +1230,7 @@
 			<description>query for VEVENTs that contain a SUMMARY equals</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/24.xml</filepath>
@@ -1243,7 +1251,7 @@
 			<description>query for VEVENTs that contain a SUMMARY contains</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/basicquery/25.xml</filepath>
@@ -1265,7 +1273,7 @@
 			<description>query for resources with VCALENDAR & VEVENT defined - return filtered data</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/filtereddata/1.xml</filepath>
@@ -1290,7 +1298,7 @@
 			<description>query for resources with VCALENDAR & VEVENT defined - return filtered data</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/filtereddata/2.xml</filepath>
@@ -1318,7 +1326,7 @@
 			<description>query for VEVENTs within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/1.txt</filepath>
@@ -1339,7 +1347,7 @@
 			<description>query for VEVENT and VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/2.txt</filepath>
@@ -1359,7 +1367,7 @@
 			<description>query for VEVENT or VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/14.xml</filepath>
@@ -1388,7 +1396,7 @@
 			<description>query for VEVENTs within time range with specific SUMMARY text</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/3.txt</filepath>
@@ -1406,7 +1414,7 @@
 			<description>query for VEVENT recurrence instance within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/4.txt</filepath>
@@ -1424,7 +1432,7 @@
 			<description>query for overridden VEVENT instance within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/5.txt</filepath>
@@ -1442,7 +1450,7 @@
 			<description>query for overridden VEVENT not within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/6.txt</filepath>
@@ -1456,7 +1464,7 @@
 			<description>query for overridden this-and-future VEVENT within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/7.txt</filepath>
@@ -1474,7 +1482,7 @@
 			<description>query for VTODOs within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/101.txt</filepath>
@@ -1494,7 +1502,7 @@
 			<description>query for VTODOs within time range with specific SUMMARY text</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/102.txt</filepath>
@@ -1512,7 +1520,7 @@
 			<description>query for VTODO recurrence instance within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/103.txt</filepath>
@@ -1532,7 +1540,7 @@
 			<description>Invalid VTIMEZONE check</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/104.xml</filepath>
@@ -1550,7 +1558,7 @@
 			<description>query for VEVENTs within time range in distant future</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/8.txt</filepath>
@@ -1569,7 +1577,7 @@
 			<description>query for VEVENTs within time range - no end</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/9.xml</filepath>
@@ -1601,7 +1609,7 @@
 			<description>query for VEVENTs within time range - no start</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/10.xml</filepath>
@@ -1626,7 +1634,7 @@
 			<description>query for VEVENTs within time range - no start and no end</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/11.xml</filepath>
@@ -1644,7 +1652,7 @@
 			<description>query for VEVENTs within time range - too many</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/12.xml</filepath>
@@ -1662,7 +1670,7 @@
 			<description>query for free busy with overlapping and consecutive events</description>
 			<request end-delete="yes">
 				<method>PUT</method>
-				<ruri>$calendarpath1:/23.ics</ruri>
+				<ruri>$pathprefix1:/allcomponents/23.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/put/23.ics</filepath>
@@ -1673,7 +1681,7 @@
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/13.xml</filepath>
@@ -1691,7 +1699,7 @@
 			<description>query for VEVENTS and VTODOs within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/201.xml</filepath>
@@ -1711,7 +1719,7 @@
 			<description>query for VEVENTS or VTODOs within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/204.xml</filepath>
@@ -1735,7 +1743,7 @@
 			<description>query for VEVENTS and VTODOs with start only</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/202.xml</filepath>
@@ -1755,7 +1763,7 @@
 			<description>query for VEVENTS or VTODOs with start only</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/205.xml</filepath>
@@ -1792,7 +1800,7 @@
 			<description>query for VEVENTS with start only and all VTODOs</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/203.xml</filepath>
@@ -1812,7 +1820,7 @@
 			<description>query for VEVENTS with start only or all VTODOs</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/timerangequery/206.xml</filepath>
@@ -1854,7 +1862,7 @@
 			<description>query for VALARMS within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/alarmtimerangequery/1.txt</filepath>
@@ -1872,7 +1880,7 @@
 			<description>query for repeating VALARMS within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/alarmtimerangequery/2.txt</filepath>
@@ -1890,7 +1898,7 @@
 			<description>query for recurring VALARMS within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/alarmtimerangequery/3.txt</filepath>
@@ -1909,7 +1917,7 @@
 			<description>query for recurring/overridden VALARMS within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/alarmtimerangequery/4.txt</filepath>
@@ -1928,7 +1936,7 @@
 			<description>query for VALARMS on VTODO within time range</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/alarmtimerangequery/5.txt</filepath>
@@ -1949,7 +1957,7 @@
 			<description>query for free busy with time range</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/freebusy/1.txt</filepath>
@@ -1985,7 +1993,7 @@
 			<description>query for free busy with overlapping and consecutive events</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/freebusy/2.txt</filepath>
@@ -2018,7 +2026,7 @@
 			<description>time-range query with limit over same range</description>
 			<request print-response='yes'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/limitexpand/1.txt</filepath>
@@ -2038,7 +2046,7 @@
 			<description>time-range query with limit over different range</description>
 			<request print-response='yes'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/limitexpand/2.txt</filepath>
@@ -2058,7 +2066,7 @@
 			<description>time-range query with expand over same range</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/limitexpand/3.txt</filepath>
@@ -2079,7 +2087,7 @@
 			<description>time-range query with expand over different range</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/limitexpand/4.txt</filepath>
@@ -2100,7 +2108,7 @@
 			<description>query with limit-freebusy-set</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/limitexpand/5.txt</filepath>
@@ -2118,7 +2126,7 @@
 			<description>query with expand all-day - no timezone</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/limitexpand/6.xml</filepath>
@@ -2132,7 +2140,7 @@
 			<description>query with expand all-day - timezone</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/limitexpand/7.xml</filepath>
@@ -2157,7 +2165,7 @@
 			<description>time-range query with expand for one event - DURATION test</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/limitexpand/8.xml</filepath>
@@ -2192,7 +2200,7 @@
 			<description>time-range query with expand for one recurring event skipping cancelled first instance</description>
 			<request end-delete="yes">
 				<method>PUT</method>
-				<ruri>$calendarpath1:/24.ics</ruri>
+				<ruri>$pathprefix1:/allcomponents/24.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/put/24.ics</filepath>
@@ -2203,7 +2211,7 @@
 			</request>
 			<request end-delete="yes">
 				<method>PUT</method>
-				<ruri>$calendarpath1:/25.ics</ruri>
+				<ruri>$pathprefix1:/allcomponents/25.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/put/25.ics</filepath>
@@ -2214,7 +2222,7 @@
 			</request>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$calendarpath1:/</ruri>
+				<ruri>$pathprefix1:/allcomponents/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/limitexpand/9.xml</filepath>

Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sharing-multiple.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sharing-multiple.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sharing-multiple.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sharing-notification-sync.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sharing-notification-sync.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sync-report.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sync-report.xml	2011-10-25 19:42:42 UTC (rev 8223)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/sync-report.xml	2011-10-25 19:43:28 UTC (rev 8224)
@@ -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>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111025/187bf6ba/attachment-0001.html>


More information about the calendarserver-changes mailing list