[CalendarServer-changes] [3521] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Dec 12 12:39:41 PST 2008
Revision: 3521
http://trac.macosforge.org/projects/calendarserver/changeset/3521
Author: cdaboo at apple.com
Date: 2008-12-12 12:39:41 -0800 (Fri, 12 Dec 2008)
Log Message:
-----------
Major re-factor to re-do the way substitutions are handled and used to make it easier to quickly change
serverinfo scripts to suite different environments.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/aclreports/20.xml
CalDAVTester/trunk/Resource/acls/7.xml
CalDAVTester/trunk/Resource/privateevents/10.ics
CalDAVTester/trunk/Resource/privateevents/11.ics
CalDAVTester/trunk/Resource/privateevents/12.ics
CalDAVTester/trunk/Resource/privateevents/13.ics
CalDAVTester/trunk/Resource/privateevents/38.ics
CalDAVTester/trunk/Resource/privateevents/40.ics
CalDAVTester/trunk/Resource/privateevents/41.ics
CalDAVTester/trunk/Resource/privateevents/42.ics
CalDAVTester/trunk/Resource/privateevents/43.ics
CalDAVTester/trunk/Resource/privateevents/49.ics
CalDAVTester/trunk/Resource/privateevents/50.ics
CalDAVTester/trunk/Resource/schedule/17.txt
CalDAVTester/trunk/Resource/schedule/18.txt
CalDAVTester/trunk/Resource/schedule/4.txt
CalDAVTester/trunk/Resource/scheduleprops/4.xml
CalDAVTester/trunk/scripts/server/serverinfo.dtd
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/server/sslserverinfo.xml
CalDAVTester/trunk/scripts/tests/acl.xml
CalDAVTester/trunk/scripts/tests/aclreports.xml
CalDAVTester/trunk/scripts/tests/attachments.xml
CalDAVTester/trunk/scripts/tests/availability.xml
CalDAVTester/trunk/scripts/tests/caldavIOP.xml
CalDAVTester/trunk/scripts/tests/caldavtest.dtd
CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
CalDAVTester/trunk/scripts/tests/copymove.xml
CalDAVTester/trunk/scripts/tests/ctag.xml
CalDAVTester/trunk/scripts/tests/current-user-principal.xml
CalDAVTester/trunk/scripts/tests/delete.xml
CalDAVTester/trunk/scripts/tests/depthreports.xml
CalDAVTester/trunk/scripts/tests/depthreportsacl.xml
CalDAVTester/trunk/scripts/tests/directory.xml
CalDAVTester/trunk/scripts/tests/dropbox.xml
CalDAVTester/trunk/scripts/tests/encodedURIs.xml
CalDAVTester/trunk/scripts/tests/errors.xml
CalDAVTester/trunk/scripts/tests/expandproperty.xml
CalDAVTester/trunk/scripts/tests/floating.xml
CalDAVTester/trunk/scripts/tests/get.xml
CalDAVTester/trunk/scripts/tests/ical-client.xml
CalDAVTester/trunk/scripts/tests/implicitacls.xml
CalDAVTester/trunk/scripts/tests/implicitauto1.xml
CalDAVTester/trunk/scripts/tests/implicitauto2.xml
CalDAVTester/trunk/scripts/tests/implicitauto3.xml
CalDAVTester/trunk/scripts/tests/implicitauto4.xml
CalDAVTester/trunk/scripts/tests/implicitcalendartransp.xml
CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml
CalDAVTester/trunk/scripts/tests/implicitcopymove.xml
CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml
CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml
CalDAVTester/trunk/scripts/tests/impliciterrors.xml
CalDAVTester/trunk/scripts/tests/implicitoptions.xml
CalDAVTester/trunk/scripts/tests/implicitprivateevents.xml
CalDAVTester/trunk/scripts/tests/implicitproxy.xml
CalDAVTester/trunk/scripts/tests/implicitrecur1.xml
CalDAVTester/trunk/scripts/tests/implicitscenario1.xml
CalDAVTester/trunk/scripts/tests/implicitscenario2.xml
CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml
CalDAVTester/trunk/scripts/tests/mkcalendar.xml
CalDAVTester/trunk/scripts/tests/nonascii.xml
CalDAVTester/trunk/scripts/tests/populate.xml
CalDAVTester/trunk/scripts/tests/privatecomments.xml
CalDAVTester/trunk/scripts/tests/privateevents.xml
CalDAVTester/trunk/scripts/tests/propfind.xml
CalDAVTester/trunk/scripts/tests/proppatch.xml
CalDAVTester/trunk/scripts/tests/proxyauthz.xml
CalDAVTester/trunk/scripts/tests/put.xml
CalDAVTester/trunk/scripts/tests/quota.xml
CalDAVTester/trunk/scripts/tests/recurrenceput.xml
CalDAVTester/trunk/scripts/tests/reports.xml
CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml
CalDAVTester/trunk/scripts/tests/schedulenomore.xml
CalDAVTester/trunk/scripts/tests/schedulepost.xml
CalDAVTester/trunk/scripts/tests/schedulepostacl.xml
CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml
CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml
CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml
CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml
CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
CalDAVTester/trunk/scripts/tests/scheduleprops.xml
CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml
CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml
CalDAVTester/trunk/scripts/tests/timezones.xml
CalDAVTester/trunk/scripts/tests/timezoneservice.xml
CalDAVTester/trunk/src/request.py
CalDAVTester/trunk/src/serverinfo.py
CalDAVTester/trunk/src/xmlDefs.py
CalDAVTester/trunk/verifiers/dataString.py
Removed Paths:
-------------
CalDAVTester/trunk/scripts/server/serverinfo-monitor.xml
CalDAVTester/trunk/scripts/server/serverinfo-template-old.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
Modified: CalDAVTester/trunk/Resource/aclreports/20.xml
===================================================================
--- CalDAVTester/trunk/Resource/aclreports/20.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/aclreports/20.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<multistatus xmlns='DAV:'>
<response>
- <href>$principals:</href>
+ <href>$principals_users:</href>
<propstat>
<prop>
<supported-report-set>
Modified: CalDAVTester/trunk/Resource/acls/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/acls/7.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/acls/7.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principaluriadmin:</D:href>
+ <D:href>$principaluri_admin:</D:href>
</D:principal>
<D:deny>
<D:privilege><D:write-acl/></D:privilege>
Modified: CalDAVTester/trunk/Resource/privateevents/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/10.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/10.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -27,8 +27,8 @@
DURATION:PT1H
SUMMARY:event confidential access 1
LOCATION:confidential 1
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE:mailto:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
UID:54E181BC7CCC373042B28842FFC at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/11.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/11.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -26,8 +26,8 @@
DURATION:PT1H
SUMMARY:event confidential access 2
LOCATION:confidential 2
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE:mailto:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
UID:54E181BC7CCC373042B28842FFC at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/12.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/12.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -27,8 +27,8 @@
DURATION:PT1H
SUMMARY:event restricted access 1
LOCATION:restricted 1
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE:mailto:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
UID:54E181BC7CCC373042B28842FFD at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/13.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/13.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -26,8 +26,8 @@
DURATION:PT1H
SUMMARY:event restricted access 2
LOCATION:restricted 2
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE:mailto:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
UID:54E181BC7CCC373042B28842FFD at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/38.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/38.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -55,10 +55,10 @@
DTSTART;TZID=US/Eastern:20060101T100000
DURATION:PT1H
ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling mess
- age has been delivered":mailto:user02 at example.com
+ age has been delivered":$cuaddr2:
DTSTAMP:20051222T205953Z
LOCATION:confidential 1
-ORGANIZER:mailto:user01 at example.com
+ORGANIZER:$cuaddr1:
SUMMARY:event confidential access 1
BEGIN:VALARM
ACTION:DISPLAY
@@ -71,10 +71,10 @@
DTSTART;TZID=US/Eastern:20060101T100000
DURATION:PT1H
ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling mess
- age has been delivered":mailto:user02 at example.com
+ age has been delivered":$cuaddr2:
DTSTAMP:20051222T205953Z
LOCATION:restricted 1
-ORGANIZER:mailto:user01 at example.com
+ORGANIZER:$cuaddr1:
SUMMARY:event restricted access 1
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/40.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/40.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/40.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -27,8 +27,8 @@
DURATION:PT1H
SUMMARY:event confidential access 1
LOCATION:confidential 1
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE:mailto:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
UID:54E181BC7CCC373042B28842FFC-40 at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/41.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/41.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/41.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -26,8 +26,8 @@
DURATION:PT1H
SUMMARY:event confidential access 2
LOCATION:confidential 2
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE:mailto:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
UID:54E181BC7CCC373042B28842FFC-40 at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/42.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/42.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/42.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -27,8 +27,8 @@
DURATION:PT1H
SUMMARY:event restricted access 1
LOCATION:restricted 1
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE:mailto:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
UID:54E181BC7CCC373042B28842FFD-42 at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/43.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/43.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/43.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -26,8 +26,8 @@
DURATION:PT1H
SUMMARY:event restricted access 2
LOCATION:restricted 2
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE:mailto:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
UID:54E181BC7CCC373042B28842FFD-42 at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/49.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/49.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/49.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -27,9 +27,8 @@
DURATION:PT1H
SUMMARY:event confidential access 2
LOCATION:confidential 2
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling message has been delivered":mailt
- o:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling message has been delivered":$cuaddr2:
UID:54E181BC7CCC373042B28842FFC-40 at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/privateevents/50.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/50.ics 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/privateevents/50.ics 2008-12-12 20:39:41 UTC (rev 3521)
@@ -27,9 +27,8 @@
DURATION:PT1H
SUMMARY:event restricted access 2
LOCATION:restricted 2
-ORGANIZER:mailto:user01 at example.com
-ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling message has been delivered":mailt
- o:user02 at example.com
+ORGANIZER:$cuaddr1:
+ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling message has been delivered":$cuaddr2:
UID:54E181BC7CCC373042B28842FFD-42 at ninevah.local
BEGIN:VALARM
ACTION:DISPLAY
Modified: CalDAVTester/trunk/Resource/schedule/17.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/17.txt 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/schedule/17.txt 2008-12-12 20:39:41 UTC (rev 3521)
@@ -28,8 +28,8 @@
DURATION:PT1H
SUMMARY:event 1
UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:mailto:user04 at example.com
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:mailto:user02 at example.com
-ATTENDEE;CN=User 03:mailto:user03 at example.com
+ORGANIZER;CN=User 01:cuaddr4:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:cuaddr2:
+ATTENDEE;CN=User 03:cuaddr3:
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/schedule/18.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/18.txt 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/schedule/18.txt 2008-12-12 20:39:41 UTC (rev 3521)
@@ -28,7 +28,7 @@
DURATION:PT1H
SUMMARY:event 1
UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:mailto:user04 at example.com
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:mailto:user03 at example.com
+ORGANIZER;CN=User 01:cuaddr4:
+ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:cuaddr3:
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/schedule/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/4.txt 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/schedule/4.txt 2008-12-12 20:39:41 UTC (rev 3521)
@@ -28,7 +28,7 @@
DURATION:PT1H
SUMMARY:event 1
UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:mailto:user04 at example.com
+ORGANIZER;CN=User 01:cuaddr4:
ATTENDEE;CN=User 02:$cuaddr2:
ATTENDEE;CN=User 03:$cuaddr3:
END:VEVENT
Modified: CalDAVTester/trunk/Resource/scheduleprops/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/scheduleprops/4.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/Resource/scheduleprops/4.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -2,7 +2,7 @@
<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:set>
<D:prop>
-<C:calendar-free-busy-set><D:href>$calendarpath1:</D:href><D:href>/calendars/users/user01/dropbox/</D:href></C:calendar-free-busy-set>
+<C:calendar-free-busy-set><D:href>$calendarpath1:</D:href><D:href>$calendarpath1:/$dropbox/</D:href></C:calendar-free-busy-set>
</D:prop>
</D:set>
</D:propertyupdate>
Deleted: CalDAVTester/trunk/scripts/server/serverinfo-monitor.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-monitor.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/server/serverinfo-monitor.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -1,165 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE serverinfo SYSTEM "serverinfo.dtd">
-
-<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<serverinfo>
- <host>localhost</host>
- <port>8008</port>
- <authtype>basic</authtype>
- <substitutions>
- <substitution>
- <key>$host:</key>
- <value>http://localhost:8008</value>
- </substitution>
-
- <!-- relative path to principal collection-->
- <substitution>
- <key>$principals:</key>
- <value>/principals/users/</value>
- </substitution>
-
- <!-- relative path to group principal collection-->
- <substitution>
- <key>$groups:</key>
- <value>/principals/groups/</value>
- </substitution>
-
- <!-- relative path to resource principal collection-->
- <substitution>
- <key>$resources:</key>
- <value>/principals/resources/</value>
- </substitution>
-
- <!-- relative path to location principal collection-->
- <substitution>
- <key>$locations:</key>
- <value>/principals/locations/</value>
- </substitution>
-
- <!-- relative path to __uids__ principal collection-->
- <substitution>
- <key>$uids:</key>
- <value>/principals/locations/</value>
- </substitution>
-
- <!-- relative path to calendars collection-->
- <substitution>
- <key>$calendars:</key>
- <value>/calendars/</value>
- </substitution>
-
- <!-- relative path to user calendars collection-->
- <substitution>
- <key>$usercalendars:</key>
- <value>/calendars/users/</value>
- </substitution>
-
- <!-- inbox name-->
- <substitution>
- <key>$inbox:</key>
- <value>inbox</value>
- </substitution>
-
- <!-- outbox name-->
- <substitution>
- <key>$outbox:</key>
- <value>outbox</value>
- </substitution>
-
- <!-- user id for admin user -->
- <substitution>
- <key>$useradmin:</key>
- <value>admin</value>
- </substitution>
- <!-- password for admin user -->
- <substitution>
- <key>$pswdadmin:</key>
- <value>admin</value>
- </substitution>
-
- <!-- relative path to admin principal resource-->
- <substitution>
- <key>$principaladmin:</key>
- <value>/principals/users/admin/</value>
- </substitution>
- <substitution>
- <key>$principaluriadmin:</key>
- <value>/principals/__uids__/admin/</value>
- </substitution>
-
- <!-- user id for proxy user -->
- <substitution>
- <key>$userproxy:</key>
- <value>superuser</value>
- </substitution>
- <!-- password for proxy user -->
- <substitution>
- <key>$pswdproxy:</key>
- <value>superuser</value>
- </substitution>
-
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$userid1:</key>
- <value>user01</value>
- </substitution>
- <!-- password for first user -->
- <substitution>
- <key>$pswd1:</key>
- <value>user01</value>
- </substitution>
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$principal1:</key>
- <value>/principals/users/user01/</value>
- </substitution>
- <substitution>
- <key>$principaluri1:</key>
- <value>/principals/__uids__/user01/</value>
- </substitution>
- <substitution>
- <key>$principal1noslash:</key>
- <value>/principals/users/user01</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$pathprefix1:</key>
- <value>/calendars/users/user01</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$calendarpath1:</key>
- <value>/calendars/users/user01/calendar</value>
- </substitution>
- <!-- calendar user address of first user-->
- <substitution>
- <key>$cuaddr1:</key>
- <value>mailto:user01 at example.com</value>
- </substitution>
- <substitution>
- <key>$cuaddralt1:</key>
- <value>/principals/__uids__/user01/</value>
- </substitution>
- <substitution>
- <key>$cuaddraltnoslash1:</key>
- <value>/principals/__uids__/user01</value>
- </substitution>
-
- </substitutions>
-</serverinfo>
Deleted: CalDAVTester/trunk/scripts/server/serverinfo-template-old.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template-old.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template-old.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -1,259 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE serverinfo SYSTEM "serverinfo.dtd">
-
-<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<serverinfo>
- <host>%(hostname)s</host>
- <port>8008</port>
- <authtype>digest</authtype>
- <substitutions>
- <substitution>
- <key>$host:</key>
- <value>http://%(hostname)s:8008</value>
- </substitution>
-
- <!-- relative path to principal collection-->
- <substitution>
- <key>$principals:</key>
- <value>/principals/users/</value>
- </substitution>
-
- <!-- relative path to group principal collection-->
- <substitution>
- <key>$groups:</key>
- <value>/principals/groups/</value>
- </substitution>
-
- <!-- relative path to resource principal collection-->
- <substitution>
- <key>$resources:</key>
- <value>/principals/resources/</value>
- </substitution>
-
- <!-- relative path to location principal collection-->
- <substitution>
- <key>$locations:</key>
- <value>/principals/locations/</value>
- </substitution>
-
- <!-- relative path to __uids__ principal collection-->
- <substitution>
- <key>$uids:</key>
- <value>/principals/locations/</value>
- </substitution>
-
- <!-- relative path to calendars collection-->
- <substitution>
- <key>$calendars:</key>
- <value>/calendars/</value>
- </substitution>
-
- <!-- relative path to user calendars collection-->
- <substitution>
- <key>$usercalendars:</key>
- <value>/calendars/users/</value>
- </substitution>
-
- <!-- inbox name-->
- <substitution>
- <key>$inbox:</key>
- <value>inbox</value>
- </substitution>
-
- <!-- outbox name-->
- <substitution>
- <key>$outbox:</key>
- <value>outbox</value>
- </substitution>
-
- <!-- user id for admin user -->
- <substitution>
- <key>$useradmin:</key>
- <value>testadmin</value>
- </substitution>
- <!-- password for admin user -->
- <substitution>
- <key>$pswdadmin:</key>
- <value>testadmin</value>
- </substitution>
-
- <!-- relative path to admin principal resource-->
- <substitution>
- <key>$principaladmin:</key>
- <value>/principals/users/testadmin/</value>
- </substitution>
- <substitution>
- <key>$principaluriadmin:</key>
- <value>/principals/users/testadmin/</value>
- </substitution>
-
- <!-- user id for proxy user -->
- <substitution>
- <key>$userproxy:</key>
- <value>superuser</value>
- </substitution>
- <!-- password for proxy user -->
- <substitution>
- <key>$pswdproxy:</key>
- <value>superuser</value>
- </substitution>
-
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$userid1:</key>
- <value>user01</value>
- </substitution>
- <!-- password for first user -->
- <substitution>
- <key>$pswd1:</key>
- <value>user01</value>
- </substitution>
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$principal1:</key>
- <value>/principals/users/user01/</value>
- </substitution>
- <substitution>
- <key>$principaluri1:</key>
- <value>/principals/users/user01/</value>
- </substitution>
- <substitution>
- <key>$principal1noslash:</key>
- <value>/principals/users/user01</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$pathprefix1:</key>
- <value>/calendars/users/user01</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$calendarpath1:</key>
- <value>/calendars/users/user01/calendar</value>
- </substitution>
- <!-- calendar user address of first user-->
- <substitution>
- <key>$cuaddr1:</key>
- <value>mailto:user01 at example.com</value>
- </substitution>
- <substitution>
- <key>$cuaddralt1:</key>
- <value>/principals/users/user01/</value>
- </substitution>
- <substitution>
- <key>$cuaddraltnoslash1:</key>
- <value>/principals/users/user01</value>
- </substitution>
-
- <!-- user id for second user -->
- <substitution>
- <key>$userid2:</key>
- <value>user02</value>
- </substitution>
- <!-- password for second user -->
- <substitution>
- <key>$pswd2:</key>
- <value>user02</value>
- </substitution>
- <!-- relative path to second user principal resource-->
- <substitution>
- <key>$principal2:</key>
- <value>/principals/users/user02/</value>
- </substitution>
- <substitution>
- <key>$principaluri2:</key>
- <value>/principals/users/user02/</value>
- </substitution>
- <substitution>
- <key>$principal2noslash:</key>
- <value>/principals/users/user02</value>
- </substitution>
- <!-- relative path to second user calendar home-->
- <substitution>
- <key>$pathprefix2:</key>
- <value>/calendars/users/user02</value>
- </substitution>
- <!-- calendar user address of second user-->
- <substitution>
- <key>$cuaddr2:</key>
- <value>mailto:user02 at example.com</value>
- </substitution>
- <substitution>
- <key>$cuaddralt2:</key>
- <value>/principals/users/user02/</value>
- </substitution>
- <substitution>
- <key>$cuaddraltnoslash2:</key>
- <value>/principals/users/user02</value>
- </substitution>
-
- <!-- user id for third user -->
- <substitution>
- <key>$userid3:</key>
- <value>user03</value>
- </substitution>
- <!-- password for third user -->
- <substitution>
- <key>$pswd3:</key>
- <value>user03</value>
- </substitution>
- <!-- relative path to third user principal resource-->
- <substitution>
- <key>$principal3:</key>
- <value>/principals/users/user03/</value>
- </substitution>
- <substitution>
- <key>$principaluri3:</key>
- <value>/principals/users/user03/</value>
- </substitution>
- <!-- relative path to third user calendar home-->
- <substitution>
- <key>$pathprefix3:</key>
- <value>/calendars/users/user03</value>
- </substitution>
- <!-- calendar user address of third user-->
- <substitution>
- <key>$cuaddr3:</key>
- <value>mailto:user03 at example.com</value>
- </substitution>
- <substitution>
- <key>$cuaddralt3:</key>
- <value>/principals/users/user03/</value>
- </substitution>
-
- <!-- relative path to first resource calendar home-->
- <substitution>
- <key>$rpathprefix1:</key>
- <value>/calendars/resources/resource01</value>
- </substitution>
- <!-- relative path to first resource principal resource-->
- <substitution>
- <key>$rprincipal1:</key>
- <value>/principals/resources/resource01/</value>
- </substitution>
- <substitution>
- <key>$rprincipaluri1:</key>
- <value>/principals/resources/resource01/</value>
- </substitution>
- <substitution>
- <key>$rcuaddralt1:</key>
- <value>/principals/resources/resource01/</value>
- </substitution>
- </substitutions>
-</serverinfo>
Deleted: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -1,259 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE serverinfo SYSTEM "serverinfo.dtd">
-
-<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<serverinfo>
- <host>%(hostname)s</host>
- <port>8008</port>
- <authtype>digest</authtype>
- <substitutions>
- <substitution>
- <key>$host:</key>
- <value>http://%(hostname)s:8008</value>
- </substitution>
-
- <!-- relative path to principal collection-->
- <substitution>
- <key>$principals:</key>
- <value>/principals/users/</value>
- </substitution>
-
- <!-- relative path to group principal collection-->
- <substitution>
- <key>$groups:</key>
- <value>/principals/groups/</value>
- </substitution>
-
- <!-- relative path to resource principal collection-->
- <substitution>
- <key>$resources:</key>
- <value>/principals/resources/</value>
- </substitution>
-
- <!-- relative path to location principal collection-->
- <substitution>
- <key>$locations:</key>
- <value>/principals/locations/</value>
- </substitution>
-
- <!-- relative path to __uids__ principal collection-->
- <substitution>
- <key>$uids:</key>
- <value>/principals/locations/</value>
- </substitution>
-
- <!-- relative path to calendars collection-->
- <substitution>
- <key>$calendars:</key>
- <value>/calendars/</value>
- </substitution>
-
- <!-- relative path to user calendars collection-->
- <substitution>
- <key>$usercalendars:</key>
- <value>/calendars/users/</value>
- </substitution>
-
- <!-- inbox name-->
- <substitution>
- <key>$inbox:</key>
- <value>inbox</value>
- </substitution>
-
- <!-- outbox name-->
- <substitution>
- <key>$outbox:</key>
- <value>outbox</value>
- </substitution>
-
- <!-- user id for admin user -->
- <substitution>
- <key>$useradmin:</key>
- <value>testadmin</value>
- </substitution>
- <!-- password for admin user -->
- <substitution>
- <key>$pswdadmin:</key>
- <value>testadmin</value>
- </substitution>
-
- <!-- relative path to admin principal resource-->
- <substitution>
- <key>$principaladmin:</key>
- <value>/principals/users/testadmin/</value>
- </substitution>
- <substitution>
- <key>$principaluriadmin:</key>
- <value>/principals/__uids__/%(testadmin_guid)s/</value>
- </substitution>
-
- <!-- user id for proxy user -->
- <substitution>
- <key>$userproxy:</key>
- <value>superuser</value>
- </substitution>
- <!-- password for proxy user -->
- <substitution>
- <key>$pswdproxy:</key>
- <value>superuser</value>
- </substitution>
-
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$userid1:</key>
- <value>user01</value>
- </substitution>
- <!-- password for first user -->
- <substitution>
- <key>$pswd1:</key>
- <value>user01</value>
- </substitution>
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$principal1:</key>
- <value>/principals/users/user01/</value>
- </substitution>
- <substitution>
- <key>$principaluri1:</key>
- <value>/principals/__uids__/%(user01_guid)s/</value>
- </substitution>
- <substitution>
- <key>$principal1noslash:</key>
- <value>/principals/users/user01</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$pathprefix1:</key>
- <value>/calendars/users/user01</value>
- </substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$calendarpath1:</key>
- <value>/calendars/users/user01/calendar</value>
- </substitution>
- <!-- calendar user address of first user-->
- <substitution>
- <key>$cuaddr1:</key>
- <value>mailto:user01 at example.com</value>
- </substitution>
- <substitution>
- <key>$cuaddralt1:</key>
- <value>/principals/__uids__/%(user01_guid)s/</value>
- </substitution>
- <substitution>
- <key>$cuaddraltnoslash1:</key>
- <value>/principals/__uids__/%(user01_guid)s</value>
- </substitution>
-
- <!-- user id for second user -->
- <substitution>
- <key>$userid2:</key>
- <value>user02</value>
- </substitution>
- <!-- password for second user -->
- <substitution>
- <key>$pswd2:</key>
- <value>user02</value>
- </substitution>
- <!-- relative path to second user principal resource-->
- <substitution>
- <key>$principal2:</key>
- <value>/principals/users/user02/</value>
- </substitution>
- <substitution>
- <key>$principaluri2:</key>
- <value>/principals/__uids__/%(user02_guid)s/</value>
- </substitution>
- <substitution>
- <key>$principal2noslash:</key>
- <value>/principals/users/user02</value>
- </substitution>
- <!-- relative path to second user calendar home-->
- <substitution>
- <key>$pathprefix2:</key>
- <value>/calendars/users/user02</value>
- </substitution>
- <!-- calendar user address of second user-->
- <substitution>
- <key>$cuaddr2:</key>
- <value>mailto:user02 at example.com</value>
- </substitution>
- <substitution>
- <key>$cuaddralt2:</key>
- <value>/principals/__uids__/%(user02_guid)s/</value>
- </substitution>
- <substitution>
- <key>$cuaddraltnoslash2:</key>
- <value>/principals/__uids__/%(user02_guid)s</value>
- </substitution>
-
- <!-- user id for third user -->
- <substitution>
- <key>$userid3:</key>
- <value>user03</value>
- </substitution>
- <!-- password for third user -->
- <substitution>
- <key>$pswd3:</key>
- <value>user03</value>
- </substitution>
- <!-- relative path to third user principal resource-->
- <substitution>
- <key>$principal3:</key>
- <value>/principals/users/user03/</value>
- </substitution>
- <substitution>
- <key>$principaluri3:</key>
- <value>/principals/__uids__/%(user03_guid)s/</value>
- </substitution>
- <!-- relative path to third user calendar home-->
- <substitution>
- <key>$pathprefix3:</key>
- <value>/calendars/users/user03</value>
- </substitution>
- <!-- calendar user address of third user-->
- <substitution>
- <key>$cuaddr3:</key>
- <value>mailto:user03 at example.com</value>
- </substitution>
- <substitution>
- <key>$cuaddralt3:</key>
- <value>/principals/__uids__/%(user03_guid)s/</value>
- </substitution>
-
- <!-- relative path to first resource calendar home-->
- <substitution>
- <key>$rpathprefix1:</key>
- <value>/calendars/resources/resource01</value>
- </substitution>
- <!-- relative path to first resource principal resource-->
- <substitution>
- <key>$rprincipal1:</key>
- <value>/principals/resources/resource01/</value>
- </substitution>
- <substitution>
- <key>$rprincipaluri1:</key>
- <value>/principals/__uids__/%(resource01_guid)s/</value>
- </substitution>
- <substitution>
- <key>$rcuaddralt1:</key>
- <value>/principals/__uids__/%(resource01_guid)s/</value>
- </substitution>
- </substitutions>
-</serverinfo>
Modified: CalDAVTester/trunk/scripts/server/serverinfo.dtd
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.dtd 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/server/serverinfo.dtd 2008-12-12 20:39:41 UTC (rev 3521)
@@ -22,6 +22,7 @@
<!ELEMENT ssl EMPTY>
<!ELEMENT substitutions (substitution*)>
<!ELEMENT substitution (key, value)>
+ <!ATTLIST substitution repeat CDATA "1">
<!ELEMENT key (#PCDATA)>
<!ELEMENT value (#PCDATA)>
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -28,58 +28,94 @@
<value>http://localhost:8008</value>
</substitution>
+ <!-- relative path to caldav root-->
+ <substitution>
+ <key>$root:</key>
+ <value>/</value>
+ </substitution>
+
<!-- relative path to main principal collection-->
<substitution>
<key>$principalcollection:</key>
- <value>/principals/</value>
+ <value>$root:principals/</value>
</substitution>
- <!-- relative path to user principal collection-->
+ <!-- the core recored type collections-->
<substitution>
- <key>$principals:</key>
- <value>/principals/users/</value>
+ <key>$uidstype:</key>
+ <value>__uids__</value>
</substitution>
-
- <!-- relative path to group principal collection-->
<substitution>
- <key>$groups:</key>
- <value>/principals/groups/</value>
+ <key>$userstype:</key>
+ <value>users</value>
</substitution>
-
- <!-- relative path to resource principal collection-->
<substitution>
- <key>$resources:</key>
- <value>/principals/resources/</value>
+ <key>$groupstype:</key>
+ <value>groups</value>
</substitution>
-
- <!-- relative path to location principal collection-->
<substitution>
- <key>$locations:</key>
- <value>/principals/locations/</value>
+ <key>$locationstype:</key>
+ <value>locations</value>
</substitution>
+ <substitution>
+ <key>$resourcestype:</key>
+ <value>resources</value>
+ </substitution>
- <!-- relative path to __uids__ principal collection-->
+ <!-- relative path to record type principal collections-->
<substitution>
- <key>$uids:</key>
- <value>/principals/__uids__/</value>
+ <key>$principals_uids:</key>
+ <value>$principalcollection:$uidstype:/</value>
</substitution>
+ <substitution>
+ <key>$principals_users:</key>
+ <value>$principalcollection:$userstype:/</value>
+ </substitution>
+ <substitution>
+ <key>$principals_groups:</key>
+ <value>$principalcollection:$groupstype:/</value>
+ </substitution>
+ <substitution>
+ <key>$principals_resources:</key>
+ <value>$principalcollection:$resourcestype:/</value>
+ </substitution>
+ <substitution>
+ <key>$principals_locations:</key>
+ <value>$principalcollection:$locationstype:/</value>
+ </substitution>
<!-- relative path to calendars collection-->
<substitution>
<key>$calendars:</key>
- <value>/calendars/</value>
+ <value>$root:calendars/</value>
</substitution>
- <!-- relative path to user calendars collection-->
+ <!-- relative path to record type calendar collections-->
<substitution>
- <key>$usercalendars:</key>
- <value>/calendars/__uids__/</value>
+ <key>$calendars_uids:</key>
+ <value>$calendars:$uidstype:/</value>
</substitution>
+ <substitution>
+ <key>$calendars_users:</key>
+ <value>$calendars:$userstype:/</value>
+ </substitution>
+ <substitution>
+ <key>$calendars_groups:</key>
+ <value>$calendars:$groupstype:/</value>
+ </substitution>
+ <substitution>
+ <key>$calendars_resources:</key>
+ <value>$calendars:$resourcestype:/</value>
+ </substitution>
+ <substitution>
+ <key>$calendars_locations:</key>
+ <value>$calendars:$locationstype:/</value>
+ </substitution>
- <!-- relative path to user calendars collection-->
+ <!-- primary calendar name-->
<substitution>
- <key>$userscalendars:</key>
- <value>/calendars/users/</value>
+ <key>$calendar:</key>
+ <value>calendar</value>
</substitution>
<!-- inbox name-->
@@ -94,12 +130,30 @@
<value>outbox</value>
</substitution>
+ <!-- dropbox name-->
+ <substitution>
+ <key>$dropbox:</key>
+ <value>dropbox</value>
+ </substitution>
+
+ <!-- freebusy name-->
+ <substitution>
+ <key>$freebusy:</key>
+ <value>freebusy</value>
+ </substitution>
+
<!-- server-to-server inbox-->
<substitution>
<key>$servertoserver:</key>
- <value>/inbox</value>
+ <value>$root:inbox</value>
</substitution>
+ <!-- timezone service-->
+ <substitution>
+ <key>$timezoneservice:</key>
+ <value>$root:timezones</value>
+ </substitution>
+
<!-- user id for admin user -->
<substitution>
<key>$useradmin:</key>
@@ -113,12 +167,12 @@
<!-- relative path to admin principal resource-->
<substitution>
- <key>$principaladmin:</key>
- <value>/principals/users/admin/</value>
+ <key>$principal_admin:</key>
+ <value>$principals_users:$useradmin:/</value>
</substitution>
<substitution>
- <key>$principaluriadmin:</key>
- <value>/principals/__uids__/admin/</value>
+ <key>$principaluri_admin:</key>
+ <value>$principals_uids:$useradmin:/</value>
</substitution>
<!-- user id for proxy user -->
@@ -132,181 +186,118 @@
<value>superuser</value>
</substitution>
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$userid1:</key>
- <value>user01</value>
+ <!-- user id -->
+ <substitution repeat="10">
+ <key>$userid%d:</key>
+ <value>user%02d</value>
</substitution>
- <!-- password for first user -->
- <substitution>
- <key>$pswd1:</key>
- <value>user01</value>
+ <!-- user guid -->
+ <substitution repeat="10">
+ <key>$userguid%d:</key>
+ <value>user%02d</value>
</substitution>
+ <!-- password -->
+ <substitution repeat="10">
+ <key>$pswd%d:</key>
+ <value>user%02d</value>
+ </substitution>
<!-- relative path to first user principal resource-->
- <substitution>
- <key>$principal1:</key>
- <value>/principals/users/user01/</value>
+ <substitution repeat="10">
+ <key>$principal%d:</key>
+ <value>$principals_users:$userid%d:/</value>
</substitution>
- <substitution>
- <key>$principaluri1:</key>
- <value>/principals/__uids__/user01/</value>
+ <substitution repeat="10">
+ <key>$principaluri%d:</key>
+ <value>$principals_uids:$userguid%d:/</value>
</substitution>
- <substitution>
- <key>$principal1noslash:</key>
- <value>/principals/users/user01</value>
+ <substitution repeat="10">
+ <key>$principal%dnoslash:</key>
+ <value>$principals_users:$userid%d:</value>
</substitution>
<!-- relative path to first user calendar home-->
- <substitution>
- <key>$pathprefix1:</key>
- <value>/calendars/__uids__/user01</value>
+ <substitution repeat="10">
+ <key>$pathprefix%d:</key>
+ <value>$calendars_uids:$userguid%d:</value>
</substitution>
- <!-- relative path to first user calendar home-->
- <substitution>
- <key>$calendarpath1:</key>
- <value>/calendars/__uids__/user01/calendar</value>
+ <!-- relative path to first user calendar-->
+ <substitution repeat="10">
+ <key>$calendarpath%d:</key>
+ <value>$calendars_uids:$userguid%d:/$calendar:</value>
</substitution>
<!-- relative path to first user calendar home-->
- <substitution>
- <key>$calendarpathalt1:</key>
- <value>/calendars/users/user01/calendar</value>
+ <substitution repeat="10">
+ <key>$calendarpathalt%d:</key>
+ <value>$calendars_uids:$userid%d:/$calendar:</value>
</substitution>
<!-- calendar user address of first user-->
- <substitution>
- <key>$cuaddr1:</key>
- <value>mailto:user01 at example.com</value>
+ <substitution repeat="10">
+ <key>$cuaddr%d:</key>
+ <value>mailto:$userid%d:@example.com</value>
</substitution>
- <substitution>
- <key>$cuaddralt1:</key>
- <value>/principals/__uids__/user01/</value>
+ <substitution repeat="10">
+ <key>$cuaddralt%d:</key>
+ <value>$principaluri%d:</value>
</substitution>
- <substitution>
- <key>$cuaddraltnoslash1:</key>
- <value>/principals/__uids__/user01</value>
+ <substitution repeat="10">
+ <key>$cuaddraltnoslash%d:</key>
+ <value>$principals_uids:$userguid%d:</value>
</substitution>
- <!-- user id for second user -->
- <substitution>
- <key>$userid2:</key>
- <value>user02</value>
- </substitution>
- <!-- password for second user -->
- <substitution>
- <key>$pswd2:</key>
- <value>user02</value>
- </substitution>
- <!-- relative path to second user principal resource-->
- <substitution>
- <key>$principal2:</key>
- <value>/principals/users/user02/</value>
- </substitution>
- <substitution>
- <key>$principaluri2:</key>
- <value>/principals/__uids__/user02/</value>
- </substitution>
- <substitution>
- <key>$principal2noslash:</key>
- <value>/principals/users/user02</value>
- </substitution>
- <!-- relative path to second user calendar home-->
- <substitution>
- <key>$pathprefix2:</key>
- <value>/calendars/__uids__/user02</value>
- </substitution>
- <!-- relative path to second user calendar home-->
- <substitution>
- <key>$calendarpath2:</key>
- <value>/calendars/__uids__/user02/calendar</value>
- </substitution>
+ <!-- Override some of the above definitions for special cases -->
+
<!-- calendar user address of second user-->
<substitution>
<key>$cuaddr2:</key>
<value>MAILTO:user02 at example.com</value>
</substitution>
+
+ <!-- resource id-->
<substitution>
- <key>$cuaddralt2:</key>
- <value>/principals/__uids__/user02/</value>
+ <key>$resourceid1:</key>
+ <value>resource01</value>
</substitution>
+ <!-- resource guid-->
<substitution>
- <key>$cuaddraltnoslash2:</key>
- <value>/principals/__uids__/user02</value>
+ <key>$resourceguid1:</key>
+ <value>resource01</value>
</substitution>
-
- <!-- user id for third user -->
- <substitution>
- <key>$userid3:</key>
- <value>user03</value>
- </substitution>
- <!-- password for third user -->
- <substitution>
- <key>$pswd3:</key>
- <value>user03</value>
- </substitution>
- <!-- relative path to third user principal resource-->
- <substitution>
- <key>$principal3:</key>
- <value>/principals/users/user03/</value>
- </substitution>
- <substitution>
- <key>$principaluri3:</key>
- <value>/principals/__uids__/user03/</value>
- </substitution>
- <!-- relative path to third user calendar home-->
- <substitution>
- <key>$pathprefix3:</key>
- <value>/calendars/__uids__/user03</value>
- </substitution>
- <!-- relative path to third user calendar home-->
- <substitution>
- <key>$calendarpath3:</key>
- <value>/calendars/__uids__/user03/calendar</value>
- </substitution>
- <!-- calendar user address of third user-->
- <substitution>
- <key>$cuaddr3:</key>
- <value>mailto:user03 at example.com</value>
- </substitution>
- <substitution>
- <key>$cuaddralt3:</key>
- <value>/principals/__uids__/user03/</value>
- </substitution>
-
<!-- relative path to first resource calendar home-->
<substitution>
<key>$rpathprefix1:</key>
- <value>/calendars/__uids__/resource01</value>
+ <value>$calendars_uids:$resourceguid1:</value>
</substitution>
<!-- relative path to first resource calendar home-->
<substitution>
<key>$rcalendarpath1:</key>
- <value>/calendars/__uids__/resource01/calendar</value>
+ <value>$calendars_uids:$resourceguid1:/$calendar:</value>
</substitution>
<!-- relative path to first resource principal resource-->
<substitution>
<key>$rprincipal1:</key>
- <value>/principals/resources/resource01/</value>
+ <value>$principals_resources:$resourceid1:/</value>
</substitution>
<substitution>
<key>$rprincipaluri1:</key>
- <value>/principals/__uids__/resource01/</value>
+ <value>$principals_uids:$resourceguid1:/</value>
</substitution>
<substitution>
<key>$rcuaddralt1:</key>
- <value>/principals/__uids__/resource01/</value>
+ <value>$rprincipaluri1:</value>
</substitution>
<!-- relative path to disabled group principal resource-->
<substitution>
<key>$principaldisabled:</key>
- <value>/principals/groups/disabledgroup/</value>
+ <value>$principals_groups:disabledgroup/</value>
</substitution>
<substitution>
<key>$principaluridisabled:</key>
- <value>/principals/__uids__/disabledgroup/</value>
+ <value>$principals_uids:disabledgroup/</value>
</substitution>
<!-- calendar user address of disabled group-->
<substitution>
<key>$cuaddrdisabled:</key>
- <value>/principals/__uids__/disabledgroup/</value>
+ <value>$principals_uids:disabledgroup/</value>
</substitution>
</substitutions>
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE serverinfo SYSTEM "serverinfo.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -22,55 +22,102 @@
<host>localhost</host>
<port>8443</port>
<authtype>basic</authtype>
- <ssl/>
<substitutions>
<substitution>
<key>$host:</key>
- <value>https://localhost:8443</value>
+ <value>http://localhost:8443</value>
</substitution>
- <!-- relative path to principal collection-->
+ <!-- relative path to caldav root-->
<substitution>
- <key>$principals:</key>
- <value>/principals/users/</value>
+ <key>$root:</key>
+ <value>/</value>
</substitution>
- <!-- relative path to group principal collection-->
+ <!-- relative path to main principal collection-->
<substitution>
- <key>$groups:</key>
- <value>/principals/groups/</value>
+ <key>$principalcollection:</key>
+ <value>$root:principals/</value>
</substitution>
- <!-- relative path to resource principal collection-->
+ <!-- the core recored type collections-->
<substitution>
- <key>$resources:</key>
- <value>/principals/resources/</value>
+ <key>$uidstype:</key>
+ <value>__uids__</value>
</substitution>
-
- <!-- relative path to location principal collection-->
<substitution>
- <key>$locations:</key>
- <value>/principals/locations/</value>
+ <key>$userstype:</key>
+ <value>users</value>
</substitution>
+ <substitution>
+ <key>$groupstype:</key>
+ <value>groups</value>
+ </substitution>
+ <substitution>
+ <key>$locationstype:</key>
+ <value>locations</value>
+ </substitution>
+ <substitution>
+ <key>$resourcestype:</key>
+ <value>resources</value>
+ </substitution>
- <!-- relative path to __uids__ principal collection-->
+ <!-- relative path to record type principal collections-->
<substitution>
- <key>$uids:</key>
- <value>/principals/locations/</value>
+ <key>$principals_uids:</key>
+ <value>$principalcollection:$uidstype:/</value>
</substitution>
+ <substitution>
+ <key>$principals_users:</key>
+ <value>$principalcollection:$userstype:/</value>
+ </substitution>
+ <substitution>
+ <key>$principals_groups:</key>
+ <value>$principalcollection:$groupstype:/</value>
+ </substitution>
+ <substitution>
+ <key>$principals_resources:</key>
+ <value>$principalcollection:$resourcestype:/</value>
+ </substitution>
+ <substitution>
+ <key>$principals_locations:</key>
+ <value>$principalcollection:$locationstype:/</value>
+ </substitution>
<!-- relative path to calendars collection-->
<substitution>
<key>$calendars:</key>
- <value>/calendars/</value>
+ <value>$root:calendars/</value>
</substitution>
- <!-- relative path to user calendars collection-->
+ <!-- relative path to record type calendar collections-->
<substitution>
- <key>$usercalendars:</key>
- <value>/calendars/users/</value>
+ <key>$calendars_uids:</key>
+ <value>$calendars:$uidstype:/</value>
</substitution>
+ <substitution>
+ <key>$calendars_users:</key>
+ <value>$calendars:$userstype:/</value>
+ </substitution>
+ <substitution>
+ <key>$calendars_groups:</key>
+ <value>$calendars:$groupstype:/</value>
+ </substitution>
+ <substitution>
+ <key>$calendars_resources:</key>
+ <value>$calendars:$resourcestype:/</value>
+ </substitution>
+ <substitution>
+ <key>$calendars_locations:</key>
+ <value>$calendars:$locationstype:/</value>
+ </substitution>
+ <!-- primary calendar name-->
+ <substitution>
+ <key>$calendar:</key>
+ <value>calendar</value>
+ </substitution>
+
<!-- inbox name-->
<substitution>
<key>$inbox:</key>
@@ -83,6 +130,30 @@
<value>outbox</value>
</substitution>
+ <!-- dropbox name-->
+ <substitution>
+ <key>$dropbox:</key>
+ <value>dropbox</value>
+ </substitution>
+
+ <!-- freebusy name-->
+ <substitution>
+ <key>$freebusy:</key>
+ <value>freebusy</value>
+ </substitution>
+
+ <!-- server-to-server inbox-->
+ <substitution>
+ <key>$servertoserver:</key>
+ <value>$root:inbox</value>
+ </substitution>
+
+ <!-- timezone service-->
+ <substitution>
+ <key>$timezoneservice:</key>
+ <value>$root:timezones</value>
+ </substitution>
+
<!-- user id for admin user -->
<substitution>
<key>$useradmin:</key>
@@ -96,12 +167,12 @@
<!-- relative path to admin principal resource-->
<substitution>
- <key>$principaladmin:</key>
- <value>/principals/users/admin/</value>
+ <key>$principal_admin:</key>
+ <value>$principals_users:$useradmin:/</value>
</substitution>
<substitution>
- <key>$principaluriadmin:</key>
- <value>/principals/__uids__/admin/</value>
+ <key>$principaluri_admin:</key>
+ <value>$principals_uids:$useradmin:/</value>
</substitution>
<!-- user id for proxy user -->
@@ -115,146 +186,119 @@
<value>superuser</value>
</substitution>
- <!-- relative path to first user principal resource-->
- <substitution>
- <key>$userid1:</key>
- <value>user01</value>
+ <!-- user id -->
+ <substitution repeat="10">
+ <key>$userid%d:</key>
+ <value>user%02d</value>
</substitution>
- <!-- password for first user -->
- <substitution>
- <key>$pswd1:</key>
- <value>user01</value>
+ <!-- user guid -->
+ <substitution repeat="10">
+ <key>$userguid%d:</key>
+ <value>user%02d</value>
</substitution>
+ <!-- password -->
+ <substitution repeat="10">
+ <key>$pswd%d:</key>
+ <value>user%02d</value>
+ </substitution>
<!-- relative path to first user principal resource-->
- <substitution>
- <key>$principal1:</key>
- <value>/principals/users/user01/</value>
+ <substitution repeat="10">
+ <key>$principal%d:</key>
+ <value>$principals_users:$userid%d:/</value>
</substitution>
- <substitution>
- <key>$principaluri1:</key>
- <value>/principals/__uids__/user01/</value>
+ <substitution repeat="10">
+ <key>$principaluri%d:</key>
+ <value>$principals_uids:$userguid%d:/</value>
</substitution>
- <substitution>
- <key>$principal1noslash:</key>
- <value>/principals/users/user01</value>
+ <substitution repeat="10">
+ <key>$principal%dnoslash:</key>
+ <value>$principals_users:$userid%d:</value>
</substitution>
<!-- relative path to first user calendar home-->
- <substitution>
- <key>$pathprefix1:</key>
- <value>/calendars/users/user01</value>
+ <substitution repeat="10">
+ <key>$pathprefix%d:</key>
+ <value>$calendars_uids:$userguid%d:</value>
</substitution>
+ <!-- relative path to first user calendar-->
+ <substitution repeat="10">
+ <key>$calendarpath%d:</key>
+ <value>$calendars_uids:$userguid%d:/$calendar:</value>
+ </substitution>
<!-- relative path to first user calendar home-->
- <substitution>
- <key>$calendarpath1:</key>
- <value>/calendars/users/user01/calendar</value>
+ <substitution repeat="10">
+ <key>$calendarpathalt%d:</key>
+ <value>$calendars_uids:$userid%d:/$calendar:</value>
</substitution>
<!-- calendar user address of first user-->
- <substitution>
- <key>$cuaddr1:</key>
- <value>mailto:user01 at example.com</value>
+ <substitution repeat="10">
+ <key>$cuaddr%d:</key>
+ <value>mailto:$userid%d:@example.com</value>
</substitution>
- <substitution>
- <key>$cuaddralt1:</key>
- <value>/principals/__uids__/user01/</value>
+ <substitution repeat="10">
+ <key>$cuaddralt%d:</key>
+ <value>$principaluri%d:</value>
</substitution>
- <substitution>
- <key>$cuaddraltnoslash1:</key>
- <value>/principals/__uids__/user01</value>
+ <substitution repeat="10">
+ <key>$cuaddraltnoslash%d:</key>
+ <value>$principals_uids:$userguid%d:</value>
</substitution>
- <!-- user id for second user -->
- <substitution>
- <key>$userid2:</key>
- <value>user02</value>
- </substitution>
- <!-- password for second user -->
- <substitution>
- <key>$pswd2:</key>
- <value>user02</value>
- </substitution>
- <!-- relative path to second user principal resource-->
- <substitution>
- <key>$principal2:</key>
- <value>/principals/users/user02/</value>
- </substitution>
- <substitution>
- <key>$principaluri2:</key>
- <value>/principals/__uids__/user02/</value>
- </substitution>
- <substitution>
- <key>$principal2noslash:</key>
- <value>/principals/users/user02</value>
- </substitution>
- <!-- relative path to second user calendar home-->
- <substitution>
- <key>$pathprefix2:</key>
- <value>/calendars/users/user02</value>
- </substitution>
+ <!-- Override some of the above definitions for special cases -->
+
<!-- calendar user address of second user-->
<substitution>
<key>$cuaddr2:</key>
- <value>mailto:user02 at example.com</value>
+ <value>MAILTO:user02 at example.com</value>
</substitution>
+
+ <!-- resource id-->
<substitution>
- <key>$cuaddralt2:</key>
- <value>/principals/__uids__/user02/</value>
+ <key>$resourceid1:</key>
+ <value>resource01</value>
</substitution>
+ <!-- resource guid-->
<substitution>
- <key>$cuaddraltnoslash2:</key>
- <value>/principals/__uids__/user02</value>
+ <key>$resourceguid1:</key>
+ <value>resource01</value>
</substitution>
-
- <!-- user id for third user -->
+ <!-- relative path to first resource calendar home-->
<substitution>
- <key>$userid3:</key>
- <value>user03</value>
+ <key>$rpathprefix1:</key>
+ <value>$calendars_uids:$resourceguid1:</value>
</substitution>
- <!-- password for third user -->
+ <!-- relative path to first resource calendar home-->
<substitution>
- <key>$pswd3:</key>
- <value>user03</value>
+ <key>$rcalendarpath1:</key>
+ <value>$calendars_uids:$resourceguid1:/$calendar:</value>
</substitution>
- <!-- relative path to third user principal resource-->
+ <!-- relative path to first resource principal resource-->
<substitution>
- <key>$principal3:</key>
- <value>/principals/users/user03/</value>
+ <key>$rprincipal1:</key>
+ <value>$principals_resources:$resourceid1:/</value>
</substitution>
<substitution>
- <key>$principaluri3:</key>
- <value>/principals/__uids__/user03/</value>
+ <key>$rprincipaluri1:</key>
+ <value>$principals_uids:$resourceguid1:/</value>
</substitution>
- <!-- relative path to third user calendar home-->
<substitution>
- <key>$pathprefix3:</key>
- <value>/calendars/users/user03</value>
+ <key>$rcuaddralt1:</key>
+ <value>$rprincipaluri1:</value>
</substitution>
- <!-- calendar user address of third user-->
- <substitution>
- <key>$cuaddr3:</key>
- <value>mailto:user03 at example.com</value>
- </substitution>
- <substitution>
- <key>$cuaddralt3:</key>
- <value>/principals/__uids__/user03/</value>
- </substitution>
- <!-- relative path to first resource calendar home-->
+ <!-- relative path to disabled group principal resource-->
<substitution>
- <key>$rpathprefix1:</key>
- <value>/calendars/resources/resource01</value>
+ <key>$principaldisabled:</key>
+ <value>$principals_groups:disabledgroup/</value>
</substitution>
- <!-- relative path to first resource principal resource-->
<substitution>
- <key>$rprincipal1:</key>
- <value>/principals/resources/resource01/</value>
+ <key>$principaluridisabled:</key>
+ <value>$principals_uids:disabledgroup/</value>
</substitution>
+ <!-- calendar user address of disabled group-->
<substitution>
- <key>$rprincipaluri1:</key>
- <value>/principals/__uids__/resource01/</value>
+ <key>$cuaddrdisabled:</key>
+ <value>$principals_uids:disabledgroup/</value>
</substitution>
- <substitution>
- <key>$rcuaddralt1:</key>
- <value>/principals/__uids__/resource01/</value>
- </substitution>
+
</substitutions>
</serverinfo>
Modified: CalDAVTester/trunk/scripts/tests/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/acl.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/acl.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -32,7 +32,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/2.txt</filepath>
@@ -40,7 +40,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1todo.ics</ruri>
+ <ruri>$calendarpath1:/1todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/1.txt</filepath>
@@ -161,11 +161,11 @@
<description>PROPFIND existing VEVENT</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>PROPFIND</method>
+ <ruri>$calendars:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>/calendars/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -198,11 +198,11 @@
<description>PROPFIND without DAV:read-acl or DAV:read-current-user-privilege-set</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendars:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>/calendars/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -235,11 +235,11 @@
<description>Check for schedule privilege on iTIP Inbox</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/inbox/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/inbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -261,11 +261,11 @@
<description>Check for schedule privilege on iTIP Outbox</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/outbox/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/outbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -287,11 +287,11 @@
<description>Check for lack of schedule privilege on regular calendar</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -319,11 +319,11 @@
<description>PROPFIND all calendars</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/2.xml</filepath>
@@ -348,11 +348,11 @@
<description>PROPFIND: prinicpal-collection-set test</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/14.xml</filepath>
@@ -391,7 +391,7 @@
<description>DAV:no-ace-conflict precondition failure - attempt to set protected ACE</description>
<request print-response='no'>
<method>ACL</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/5.xml</filepath>
@@ -409,7 +409,7 @@
<description>DAV:no-ace-conflict precondition failure - attempt to set inherited ACE</description>
<request print-response='no'>
<method>ACL</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/6.xml</filepath>
@@ -427,7 +427,7 @@
<description>DAV:no-protected-ace-conflict precondition failure - attempt to change protected ACE</description>
<request print-response='no'>
<method>ACL</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/7.xml</filepath>
@@ -446,7 +446,7 @@
<description>DAV:no-inherited-ace-conflict precondition failure - attempt to change inherited ACE</description>
<request print-response='no'>
<method>ACL</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/8.xml</filepath>
@@ -465,7 +465,7 @@
<description>DAV:deny-before-grant precondition failure - attempt to deny before grant a set of ACEs</description>
<request print-response='no'>
<method>ACL</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/9.xml</filepath>
@@ -483,7 +483,7 @@
<description>DAV:not-supported-privilege precondition failure - attempt to use unsupported privilege</description>
<request print-response='no'>
<method>ACL</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/10.xml</filepath>
@@ -501,7 +501,7 @@
<description>DAV:recognized-principal precondition failure - attempt to use unknown principal</description>
<request print-response='no'>
<method>ACL</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/11.xml</filepath>
@@ -519,7 +519,7 @@
<description>Valid command</description>
<request print-response='no'>
<method>ACL</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/12.xml</filepath>
@@ -537,7 +537,7 @@
<description>Valid command</description>
<request print-response='no'>
<method>ACL</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/22.xml</filepath>
@@ -558,11 +558,11 @@
<description>COPY to non-writeable shared calendar</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/visibletouser01/copy1.ics</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -576,11 +576,11 @@
<description>COPY to non-visible shared calendar</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/notvisibletouser01/copy1.ics</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -594,6 +594,7 @@
<description>COPY to non-visible shared calendar with overwrite</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/notvisibletouser01/hidden1.ics</value>
@@ -602,7 +603,6 @@
<name>Overwrite</name>
<value>T</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -616,11 +616,11 @@
<description>COPY to visible with no overwrite shared calendar</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/writeabletouser01/1.ics</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -634,11 +634,11 @@
<description>COPY to writeable shared calendar</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/writeabletouser01/copy1.ics</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -652,11 +652,11 @@
<description>MOVE to non-writeable shared calendar</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/visibletouser01/move2.ics</value>
</header>
- <ruri>2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -670,11 +670,11 @@
<description>MOVE to non-visible shared calendar</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/notvisibletouser01/move2.ics</value>
</header>
- <ruri>2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -688,6 +688,7 @@
<description>MOVE to non-visible shared calendar with overwrite</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/notvisibletouser01/hidden1.ics</value>
@@ -696,7 +697,6 @@
<name>Overwrite</name>
<value>T</value>
</header>
- <ruri>2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -710,11 +710,11 @@
<description>MOVE to writeable shared calendar</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/writeabletouser01/move2.ics</value>
</header>
- <ruri>2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -731,11 +731,11 @@
<description>PROPFIND principal VEVENT</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/15.xml</filepath>
@@ -814,11 +814,11 @@
<description>Check that read is not set</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/calreadtoauth/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/calreadtoauth/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -836,11 +836,11 @@
<description>Check that read is not inherited</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/calreadtoauth/1.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/calreadtoauth/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -872,11 +872,11 @@
<description>Check that read is set</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/calreadtoauth/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/calreadtoauth/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -894,11 +894,11 @@
<description>Check that read is inherited</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/calreadtoauth/1.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/calreadtoauth/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -919,11 +919,11 @@
<description>Check that read is not set</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/colreadtoauth/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/colreadtoauth/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -941,11 +941,11 @@
<description>Check that read is not inherited</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/colreadtoauth/1.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/colreadtoauth/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -977,11 +977,11 @@
<description>Check that read is set</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/colreadtoauth/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/colreadtoauth/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -999,11 +999,11 @@
<description>Check that read is inherited</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/colreadtoauth/1.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/colreadtoauth/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/1.xml</filepath>
@@ -1038,11 +1038,11 @@
<description>Check for current-user-privilege-set on calendar home as user01</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/24.xml</filepath>
@@ -1064,11 +1064,11 @@
<description>Check that calendar privileges are still inherited for user02</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/calreadtoauth/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/calreadtoauth/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/24.xml</filepath>
@@ -1101,11 +1101,11 @@
<description>Check property access on calendar home as user01</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/24.xml</filepath>
@@ -1127,11 +1127,11 @@
<description>Check that calendar privileges are still inherited for user02</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/calreadtoauth/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/calreadtoauth/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/24.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/aclreports.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/aclreports.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -32,7 +32,7 @@
</request>
<request>
<method>PROPPATCH</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/aclreports/10.xml</filepath>
@@ -40,7 +40,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/2.txt</filepath>
@@ -48,7 +48,7 @@
</request>
<request>
<method>PROPPATCH</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/aclreports/9.xml</filepath>
@@ -56,7 +56,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1todo.ics</ruri>
+ <ruri>$calendarpath1:/1todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/1.txt</filepath>
@@ -69,11 +69,11 @@
<description>Wrong Depth</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/1.xml</filepath>
@@ -91,11 +91,11 @@
<description>Wrong Depth</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/1.xml</filepath>
@@ -113,11 +113,11 @@
<description>No DAV:prop</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/2.xml</filepath>
@@ -135,7 +135,7 @@
<description>Too many DAV:prop</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/3.xml</filepath>
@@ -171,7 +171,7 @@
<description>Valid report</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/1.xml</filepath>
@@ -187,7 +187,7 @@
<value>$principaluri1:</value>
<value>$principaluri1:calendar-proxy-read/</value>
<value>$principaluri1:calendar-proxy-write/</value>
- <value>$principaluriadmin:</value>
+ <value>$principaluri_admin:</value>
</arg>
</verify>
</request>
@@ -199,11 +199,11 @@
<description>Wrong Depth</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/4.xml</filepath>
@@ -221,11 +221,11 @@
<description>Wrong Depth</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/4.xml</filepath>
@@ -243,7 +243,7 @@
<description>Too many DAV:prop</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$principals:</ruri>
+ <ruri>$principals_users:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/6.xml</filepath>
@@ -261,7 +261,7 @@
<description>Valid self report with DAV:prop</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$principals:</ruri>
+ <ruri>$principals_users:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/4.xml</filepath>
@@ -283,7 +283,7 @@
<description>Valid self report without DAV:prop</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$principals:</ruri>
+ <ruri>$principals_users:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/5.xml</filepath>
@@ -305,7 +305,7 @@
<description>Valid principal-search report with DAV:prop</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/7.xml</filepath>
@@ -323,7 +323,7 @@
<description>Valid principal-search report without DAV:prop</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/8.xml</filepath>
@@ -358,11 +358,11 @@
<description>Wrong Depth</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/12.xml</filepath>
@@ -380,11 +380,11 @@
<description>Wrong Depth</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/12.xml</filepath>
@@ -402,7 +402,7 @@
<description>Valid non-apply-to report with DAV:prop</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>$principals:</ruri>
+ <ruri>$principals_users:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/12.xml</filepath>
@@ -415,7 +415,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:public01/</value>
+ <value>$principals_uids:public01/</value>
<value>$principaluri1:</value>
</arg>
</verify>
@@ -425,7 +425,7 @@
<description>Valid non-apply-to report without DAV:prop</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>$principals:</ruri>
+ <ruri>$principals_users:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/13.xml</filepath>
@@ -438,7 +438,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:public02/</value>
+ <value>$principals_uids:public02/</value>
<value>$principaluri2:</value>
</arg>
</verify>
@@ -448,7 +448,7 @@
<description>Valid apply-to report with DAV:prop</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/14.xml</filepath>
@@ -461,11 +461,11 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:public01/</value>
+ <value>$principals_uids:public01/</value>
<value>$principaluri1:</value>
- <value>$uids:group01/</value>
+ <value>$principals_uids:group01/</value>
<value>$rprincipaluri1:</value>
- <value>$uids:location01/</value>
+ <value>$principals_uids:location01/</value>
</arg>
</verify>
</request>
@@ -474,7 +474,7 @@
<description>Valid non-apply-to report without DAV:prop</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/15.xml</filepath>
@@ -487,10 +487,10 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:public02/</value>
+ <value>$principals_uids:public02/</value>
<value>$principaluri2:</value>
- <value>$uids:resource02/</value>
- <value>$uids:location02/</value>
+ <value>$principals_uids:resource02/</value>
+ <value>$principals_uids:location02/</value>
</arg>
</verify>
</request>
@@ -499,7 +499,7 @@
<description>Valid INDIVIDUAL first-name AND last-name search report</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/21.xml</filepath>
@@ -512,7 +512,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:apprentice/</value>
+ <value>$principals_uids:apprentice/</value>
</arg>
</verify>
</request>
@@ -521,7 +521,7 @@
<description>Valid INDIVIDUAL first-name OR last-name search report</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/22.xml</filepath>
@@ -534,8 +534,8 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:admin/</value>
- <value>$uids:apprentice/</value>
+ <value>$principals_uids:admin/</value>
+ <value>$principals_uids:apprentice/</value>
</arg>
</verify>
</request>
@@ -544,7 +544,7 @@
<description>Valid ROOM displayname search report</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/23.xml</filepath>
@@ -557,7 +557,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:location03/</value>
+ <value>$principals_uids:location03/</value>
</arg>
</verify>
</request>
@@ -566,7 +566,7 @@
<description>Valid RESOURCE displayname search report</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/24.xml</filepath>
@@ -579,7 +579,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:resource03/</value>
+ <value>$principals_uids:resource03/</value>
</arg>
</verify>
</request>
@@ -588,7 +588,7 @@
<description>Valid INDIVIDUAL first-name OR last-name search report - limit 1</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/25.xml</filepath>
@@ -601,7 +601,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:admin/</value>
+ <value>$principals_uids:admin/</value>
</arg>
<arg>
<name>badhrefs</name>
@@ -621,7 +621,7 @@
<description>Invalid INDIVIDUAL first-name OR last-name search report - limit bogus</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/26.xml</filepath>
@@ -639,7 +639,7 @@
<description>Invalid INDIVIDUAL first-name OR last-name search report - limit bogus</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/27.xml</filepath>
@@ -657,7 +657,7 @@
<description>Invalid search report - test attribute bogus</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/28.xml</filepath>
@@ -675,7 +675,7 @@
<description>Invalid search report - type attribute bogus</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/29.xml</filepath>
@@ -693,7 +693,7 @@
<description>Invalid search report - caseless attribute bogus</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/30.xml</filepath>
@@ -711,7 +711,7 @@
<description>Invalid search report - match-type attribute bogus</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/31.xml</filepath>
@@ -729,7 +729,7 @@
<description>Valid INDIVIDUAL first-name search report - limit 5</description>
<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
<method>REPORT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/32.xml</filepath>
@@ -742,11 +742,11 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:user01/</value>
- <value>$uids:user02/</value>
- <value>$uids:user03/</value>
- <value>$uids:user04/</value>
- <value>$uids:user05/</value>
+ <value>$principaluri1:</value>
+ <value>$principaluri2:</value>
+ <value>$principaluri3:</value>
+ <value>$principaluri4:</value>
+ <value>$principaluri5:</value>
</arg>
<arg>
<name>badhrefs</name>
@@ -769,11 +769,11 @@
<description>Wrong Depth</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/16.xml</filepath>
@@ -791,11 +791,11 @@
<description>Wrong Depth</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/16.xml</filepath>
@@ -831,7 +831,7 @@
<description>Valid report</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$principals:</ruri>
+ <ruri>$principals_users:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/16.xml</filepath>
@@ -855,11 +855,11 @@
<description>Regular resource</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/17.xml</filepath>
@@ -884,11 +884,11 @@
<description>Regular resource</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/aclreports/17.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/attachments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/attachments.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/attachments.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
<description>VEVENT with image/jpeg</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/attachments/1.ics</filepath>
@@ -39,7 +39,7 @@
</request>
<request>
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -57,7 +57,7 @@
<description>VTODO with image/jpeg</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/attachments/2.ics</filepath>
@@ -68,7 +68,7 @@
</request>
<request>
<method>GET</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -89,7 +89,7 @@
<description>VEVENT with http://</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>3.ics</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/attachments/3.ics</filepath>
@@ -100,7 +100,7 @@
</request>
<request>
<method>GET</method>
- <ruri>3.ics</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -114,7 +114,7 @@
<description>VTODO with image/jpeg</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>4.ics</ruri>
+ <ruri>$calendarpath1:/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/attachments/4.ics</filepath>
@@ -125,7 +125,7 @@
</request>
<request>
<method>GET</method>
- <ruri>4.ics</ruri>
+ <ruri>$calendarpath1:/4.ics</ruri>
<verify>
<callback>dataString</callback>
<arg>
Modified: CalDAVTester/trunk/scripts/tests/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/availability.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/availability.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
stored directly in calendars.
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/availability/1.ics</filepath>
@@ -34,7 +34,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/availability/2.ics</filepath>
@@ -42,7 +42,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>3.ics</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/availability/3.ics</filepath>
@@ -51,7 +51,7 @@
-->
<request end-delete="yes">
<method>PUT</method>
- <ruri>4.ics</ruri>
+ <ruri>$calendarpath1:/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/availability/4.ics</filepath>
@@ -64,7 +64,7 @@
<description>Check for proper capability in DAV header</description>
<request>
<method>OPTIONS</method>
- <ruri>$calendar:</ruri>
+ <ruri>$calendarpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -82,6 +82,7 @@
<description>Supported component</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -107,7 +108,7 @@
<description>PUT availability</description>
<request>
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -381,7 +382,7 @@
<description>PUT availability fails</description>
<request>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/availability/1.ics</filepath>
Modified: CalDAVTester/trunk/scripts/tests/caldavIOP.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/caldavIOP.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/caldavIOP.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
<description>Create new single-instance meeting titled "Meeting 1.1" with the location "Durham".</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1-1_1.ics</ruri>
+ <ruri>$calendarpath1:/1-1_1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/1/1_1.txt</filepath>
@@ -40,7 +40,7 @@
<description>Create new meeting titled "Meeting 1.2" recurring every Monday from 10:00 AM to 11:00 AM for 4 weeks.</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1-1_2.ics</ruri>
+ <ruri>$calendarpath1:/1-1_2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/1/1_2.txt</filepath>
@@ -54,7 +54,7 @@
<description>Create new single-instance meeting titled "Meeting 1.3" with 2 other attendees.</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1-1_3.ics</ruri>
+ <ruri>$calendarpath1:/1-1_3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/1/1_3.txt</filepath>
@@ -68,7 +68,7 @@
<description>Create new single-instance meeting titled "Meeting 1.4" with an alarm set to trigger 15 minutes prior to the schedule time of the meeting.</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1-1_4.ics</ruri>
+ <ruri>$calendarpath1:/1-1_4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/1/1_4.txt</filepath>
@@ -85,7 +85,7 @@
<description>Modify the title of meeting "Meeting 1.1" to "Meeting 1.1bis".</description>
<request>
<method>PUT</method>
- <ruri>1-1_1.ics</ruri>
+ <ruri>$calendarpath1:/1-1_1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/2/2_1.txt</filepath>
@@ -96,7 +96,7 @@
<description>Modify the location of the meeting "Meeting 1.1bis" to "Seattle bis".</description>
<request>
<method>PUT</method>
- <ruri>1-1_1.ics</ruri>
+ <ruri>$calendarpath1:/1-1_1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/2/2_2.txt</filepath>
@@ -107,7 +107,7 @@
<description>Reschedule meeting "Meeting 1.1bis" to the next day.</description>
<request>
<method>PUT</method>
- <ruri>1-1_1.ics</ruri>
+ <ruri>$calendarpath1:/1-1_1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/2/2_3.txt</filepath>
@@ -118,7 +118,7 @@
<description>Add an attendee to "Meeting 1.1bis".</description>
<request>
<method>PUT</method>
- <ruri>1-1_1.ics</ruri>
+ <ruri>$calendarpath1:/1-1_1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/2/2_4.txt</filepath>
@@ -129,7 +129,7 @@
<description>Add an alarm to "Meeting 1.1bis".</description>
<request>
<method>PUT</method>
- <ruri>1-1_1.ics</ruri>
+ <ruri>$calendarpath1:/1-1_1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/2/2_5.txt</filepath>
@@ -140,7 +140,7 @@
<description>Modify the title of the 1st instance of the recurring meeting created in 1.2.</description>
<request>
<method>PUT</method>
- <ruri>1-1_2.ics</ruri>
+ <ruri>$calendarpath1:/1-1_2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/2/2_6.txt</filepath>
@@ -151,7 +151,7 @@
<description>Modify the participation status of 1st instance to DECLINED.</description>
<request>
<method>PUT</method>
- <ruri>1-1_3.ics</ruri>
+ <ruri>$calendarpath1:/1-1_3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/2/2_7.txt</filepath>
@@ -162,7 +162,7 @@
<description>Cancel the 4th instance of the recurring meeting created in 1.2.</description>
<request>
<method>PUT</method>
- <ruri>1-1_2.ics</ruri>
+ <ruri>$calendarpath1:/1-1_2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/2/2_8.txt</filepath>
@@ -173,7 +173,7 @@
<description>One client changes "Meeting 1.1bis" to a different time, second client 'refreshes' its display to see the modification.</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>2-2_9.ics</ruri>
+ <ruri>$calendarpath1:/2-2_9.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/2/2_9.txt</filepath>
@@ -187,7 +187,7 @@
<description>Delete a single non-recurring meeting.</description>
<request>
<method>PUT</method>
- <ruri>4-4_1.ics</ruri>
+ <ruri>$calendarpath1:/4-4_1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/4/4_1.txt</filepath>
@@ -195,14 +195,14 @@
</request>
<request>
<method>DELETE</method>
- <ruri>4-4_1.ics</ruri>
+ <ruri>$calendarpath1:/4-4_1.ics</ruri>
</request>
</test>
<test name='4.2'>
<description>Delete a single recurring meeting with no overridden instances.</description>
<request>
<method>PUT</method>
- <ruri>4-4_2.ics</ruri>
+ <ruri>$calendarpath1:/4-4_2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/4/4_2.txt</filepath>
@@ -210,14 +210,14 @@
</request>
<request>
<method>DELETE</method>
- <ruri>4-4_2.ics</ruri>
+ <ruri>$calendarpath1:/4-4_2.ics</ruri>
</request>
</test>
<test name='4.3'>
<description>Delete a single recurring meeting with overridden instances.</description>
<request>
<method>PUT</method>
- <ruri>4-4_3.ics</ruri>
+ <ruri>$calendarpath1:/4-4_3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/4/4_3.txt</filepath>
@@ -225,14 +225,14 @@
</request>
<request>
<method>DELETE</method>
- <ruri>4-4_3.ics</ruri>
+ <ruri>$calendarpath1:/4-4_3.ics</ruri>
</request>
</test>
<test name='4.4'>
<description>Delete a non-overridden instance of a recurring meeting.</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>4-4_4.ics</ruri>
+ <ruri>$calendarpath1:/4-4_4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/4/4_4a.txt</filepath>
@@ -240,7 +240,7 @@
</request>
<request>
<method>PUT</method>
- <ruri>4-4_4.ics</ruri>
+ <ruri>$calendarpath1:/4-4_4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/4/4_4b.txt</filepath>
@@ -251,7 +251,7 @@
<description>Delete an overridden instance of a recurring meeting.</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>4-4_5.ics</ruri>
+ <ruri>$calendarpath1:/4-4_5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/4/4_5a.txt</filepath>
@@ -259,7 +259,7 @@
</request>
<request>
<method>PUT</method>
- <ruri>4-4_5.ics</ruri>
+ <ruri>$calendarpath1:/4-4_5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/caldaviop/4/4_5b.txt</filepath>
Modified: CalDAVTester/trunk/scripts/tests/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/caldavtest.dtd 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/caldavtest.dtd 2008-12-12 20:39:41 UTC (rev 3521)
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
<!ELEMENT start (request*)>
<!ELEMENT end (request*)>
- <!ELEMENT request (method, header*, ruri*, data?, verify*, grabheader*, grabproperty*)>
+ <!ELEMENT request (method, ruri+, header*, data?, verify*, grabheader*, grabproperty*)>
<!ATTLIST request auth (yes|no) "yes"
user CDATA ""
pswd CDATA ""
Modified: CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -155,7 +155,7 @@
<description>Verify no access to resource</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -203,11 +203,11 @@
<description>Verify no group memberships right now</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -226,11 +226,11 @@
<description>Verify single group membership</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal2:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -249,7 +249,7 @@
<description>Verify access to resource</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -353,7 +353,7 @@
<description>Verify no access to resource</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -401,11 +401,11 @@
<description>Verify no group memberships right now</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -424,11 +424,11 @@
<description>Verify single group membership</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal2:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -447,7 +447,7 @@
<description>Verify access to resource</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -461,7 +461,7 @@
<description>Verify access to resource</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -579,7 +579,7 @@
<description>Verify no access to resource</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -629,11 +629,11 @@
<description>Verify group memberships</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$rprincipal1:calendar-proxy-write/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rprincipal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -652,11 +652,11 @@
<description>Verify group memberships</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -674,11 +674,11 @@
<description>Verify read-only group memberships</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$rprincipal1:calendar-proxy-read/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rprincipal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -697,11 +697,11 @@
<description>Verify group memberships</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$principal3:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal3:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -764,7 +764,7 @@
<description>Valid self report with DAV:prop</description>
<request user='$userid2:' pswd='$pswd2:' print-response='no'>
<method>REPORT</method>
- <ruri>$principals:</ruri>
+ <ruri>$principals_users:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/6.xml</filepath>
@@ -808,11 +808,11 @@
<description>Default setup</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$principal1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/10.xml</filepath>
@@ -861,11 +861,11 @@
</request>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$principal1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/10.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/copymove.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/copymove.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/copymove.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/1.txt</filepath>
@@ -33,7 +33,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/2.txt</filepath>
@@ -53,7 +53,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>3.ics</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/3.txt</filepath>
@@ -69,7 +69,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>4.ics</ruri>
+ <ruri>$calendarpath1:/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/4.txt</filepath>
@@ -85,7 +85,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>5.ics</ruri>
+ <ruri>$calendarpath1:/5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/5.txt</filepath>
@@ -93,7 +93,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>6.ics</ruri>
+ <ruri>$calendarpath1:/6.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/6.txt</filepath>
@@ -106,11 +106,11 @@
<description>COPY within same calendar to new resource</description>
<request print-response="no">
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -125,15 +125,15 @@
<description>COPY within same calendar to existing resource with overwrite</description>
<request>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
<header>
<name>Overwrite</name>
<value>T</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -148,15 +148,15 @@
<description>COPY within same calendar to existing resource without overwrite</description>
<request>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
<header>
<name>Overwrite</name>
<value>F</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -171,11 +171,11 @@
<description>COPY to different calendar, new resource</description>
<request print-response="no">
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar2/copy2_1.ics</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -189,11 +189,11 @@
<description>COPY to different calendar, new resource, duplicate UID</description>
<request>
<method>COPY</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar2/copy2_2.ics</value>
</header>
- <ruri>2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -208,6 +208,7 @@
<description>COPY to different calendar, existing resource with overwrite</description>
<request>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar2/copy2_1.ics</value>
@@ -216,7 +217,6 @@
<name>Overwrite</name>
<value>T</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -230,6 +230,7 @@
<description>COPY to different calendar, existing resource with overwrite, duplicate UID</description>
<request>
<method>COPY</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar2/copy2_1.ics</value>
@@ -238,7 +239,6 @@
<name>Overwrite</name>
<value>T</value>
</header>
- <ruri>2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -253,6 +253,7 @@
<description>COPY to different calendar, existing resource without overwrite</description>
<request>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar2/copy2_1.ics</value>
@@ -261,7 +262,6 @@
<name>Overwrite</name>
<value>F</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -275,6 +275,7 @@
<description>COPY to different calendar, existing resource without overwrite, duplicate UID</description>
<request>
<method>COPY</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar2/copy2_1.ics</value>
@@ -283,7 +284,6 @@
<name>Overwrite</name>
<value>F</value>
</header>
- <ruri>2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -300,11 +300,11 @@
<description>MOVE within same calendar to new resource</description>
<request>
<method>MOVE</method>
+ <ruri>$calendarpath1:/5.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
- <ruri>5.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -318,15 +318,15 @@
<description>MOVE within same calendar to existing resource with overwrite</description>
<request>
<method>MOVE</method>
+ <ruri>$calendarpath1:/6.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
<header>
<name>Overwrite</name>
<value>T</value>
</header>
- <ruri>6.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -341,15 +341,15 @@
<description>MOVE within same calendar to existing resource without overwrite</description>
<request>
<method>MOVE</method>
+ <ruri>$calendarpath1:/3.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
<header>
<name>Overwrite</name>
<value>F</value>
</header>
- <ruri>3.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -363,11 +363,11 @@
<description>MOVE to different calendar, new resource</description>
<request>
<method>MOVE</method>
+ <ruri>$calendarpath1:/move1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar2/move2_1.ics</value>
</header>
- <ruri>move1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -381,6 +381,7 @@
<description>MOVE to different calendar, existing resource with overwrite</description>
<request>
<method>MOVE</method>
+ <ruri>$calendarpath1:/3.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar2/3.ics</value>
@@ -389,7 +390,6 @@
<name>Overwrite</name>
<value>T</value>
</header>
- <ruri>3.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -403,6 +403,7 @@
<description>MOVE to different calendar, existing resource without overwrite</description>
<request>
<method>MOVE</method>
+ <ruri>$calendarpath1:/4.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar2/4.ics</value>
@@ -411,7 +412,6 @@
<name>Overwrite</name>
<value>F</value>
</header>
- <ruri>4.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -435,11 +435,11 @@
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/caltest1/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/caltest1/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/7.xml</filepath>
@@ -454,22 +454,22 @@
</request>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/caltest1/</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/caltest2/</value>
</header>
- <ruri>$pathprefix1:/caltest1/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/caltest2/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/caltest2/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/7.xml</filepath>
@@ -494,11 +494,11 @@
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/caltest3/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/caltest3/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/7.xml</filepath>
@@ -513,22 +513,22 @@
</request>
<request>
<method>MOVE</method>
+ <ruri>$pathprefix1:/caltest3/</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/caltest4/</value>
</header>
- <ruri>$pathprefix1:/caltest3/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/caltest4/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/caltest4/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/copymove/7.xml</filepath>
@@ -547,11 +547,11 @@
<end>
<request>
<method>DELETE</method>
- <ruri>copy1.ics</ruri>
+ <ruri>$calendarpath1:/copy1.ics</ruri>
</request>
<request>
<method>DELETE</method>
- <ruri>move1.ics</ruri>
+ <ruri>$calendarpath1:/move1.ics</ruri>
</request>
<request>
<method>DELETE</method>
Modified: CalDAVTester/trunk/scripts/tests/ctag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/ctag.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/ctag.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -44,11 +44,11 @@
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/movecopy/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/movecopy/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -65,6 +65,7 @@
<description>Check for CTag</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -90,6 +91,7 @@
<description>Check for CTag</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -111,10 +113,11 @@
<description>Check for CTag change on DELETE</description>
<request>
<method>DELETE</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -140,7 +143,7 @@
<description>Check for CTag change on PUT of new resource</description>
<request>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -148,6 +151,7 @@
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -173,7 +177,7 @@
<description>Check for CTag change on PUT of existing resource</description>
<request>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -181,6 +185,7 @@
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -206,14 +211,15 @@
<description>Check for CTag change on MOVE of new resource</description>
<request>
<method>MOVE</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/movecopy/3.ics</value>
</header>
- <ruri>1.ics</ruri>
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -236,11 +242,11 @@
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/movecopy/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/movecopy/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -262,14 +268,15 @@
<description>Check for CTag change on COPY of new resource</description>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/movecopy/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/2.ics</value>
</header>
- <ruri>$pathprefix1:/movecopy/2.ics</ruri>
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -292,11 +299,11 @@
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/movecopy/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/movecopy/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -314,14 +321,15 @@
<description>Check for CTag change on COPY of existing resource</description>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/movecopy/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/2.ics</value>
</header>
- <ruri>$pathprefix1:/movecopy/2.ics</ruri>
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -344,11 +352,11 @@
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/movecopy/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/movecopy/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -366,14 +374,15 @@
<description>Check for CTag change on MOVE of existing resource</description>
<request>
<method>MOVE</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/movecopy/2.ics</value>
</header>
- <ruri>2.ics</ruri>
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -396,11 +405,11 @@
</request>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/movecopy/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/movecopy/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -425,11 +434,11 @@
<description>Check for CTag on calendar</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -451,11 +460,11 @@
<description>Check for CTag on inbox</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -491,11 +500,11 @@
<description>Test calendar ctag change</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -513,11 +522,11 @@
<description>Test inbox ctag change</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/current-user-principal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/current-user-principal.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/current-user-principal.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@
<description>Check for authenticated property on /</description>
<request>
<method>PROPFIND</method>
+ <ruri>$root:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/current-user-principal/1.xml</filepath>
@@ -50,11 +50,11 @@
<description>Check for unauthenticated property on /</description>
<request auth="no">
<method>PROPFIND</method>
+ <ruri>$root:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/current-user-principal/1.xml</filepath>
@@ -72,11 +72,11 @@
<description>Check for authenticated property on / (user02)</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
+ <ruri>$root:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/current-user-principal/1.xml</filepath>
@@ -97,11 +97,11 @@
<description>Check for authenticated property on /</description>
<request>
<method>PROPFIND</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/current-user-principal/1.xml</filepath>
@@ -119,11 +119,11 @@
<description>Check for unauthenticated property on /</description>
<request auth="no">
<method>PROPFIND</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/current-user-principal/1.xml</filepath>
@@ -141,11 +141,11 @@
<description>Check for authenticated property on / (user02)</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/current-user-principal/1.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/delete.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/delete.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/delete.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
<start>
<request end-delete="yes" print-response="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -33,7 +33,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1todo.ics</ruri>
+ <ruri>$calendarpath1:/1todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/1.txt</filepath>
@@ -46,7 +46,7 @@
<description>DELETE existing VEVENT</description>
<request>
<method>DELETE</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -56,7 +56,7 @@
<description>DELETE existing VTODO</description>
<request>
<method>DELETE</method>
- <ruri>1todo.ics</ruri>
+ <ruri>$calendarpath1:/1todo.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -66,7 +66,7 @@
<description>DELETE non-existing resource</description>
<request>
<method>DELETE</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
Modified: CalDAVTester/trunk/scripts/tests/depthreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/depthreports.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/depthreports.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -342,11 +342,11 @@
<description>query on calendar with Depth 0</description>
<request>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/2.txt</filepath>
@@ -369,11 +369,11 @@
<description>query on calendar with Depth 1</description>
<request>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/2.txt</filepath>
@@ -396,11 +396,11 @@
<description>query on calendar with Depth infinity</description>
<request>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/2.txt</filepath>
@@ -437,11 +437,11 @@
<description>query on collection with Depth 0</description>
<request>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/top-collection/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/2.txt</filepath>
@@ -455,11 +455,11 @@
<description>query on collection with Depth 1</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/top-collection/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/2.txt</filepath>
@@ -483,11 +483,11 @@
<description>query on collection with Depth infinity</description>
<request>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/top-collection/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/2.txt</filepath>
@@ -599,11 +599,11 @@
<description>query for free busy on calendar with Depth 0</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/freebusy/2.txt</filepath>
@@ -633,11 +633,11 @@
<description>query for free busy on calendar with Depth 1</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/freebusy/2.txt</filepath>
@@ -667,11 +667,11 @@
<description>query for free busy on calendar with Depth infinity</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/top-collection/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/freebusy/2.txt</filepath>
@@ -715,11 +715,11 @@
<description>query for free busy on collection with Depth 0</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/top-collection/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/freebusy/2.txt</filepath>
@@ -733,11 +733,11 @@
<description>query for free busy on collection with Depth 1</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/top-collection/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/freebusy/2.txt</filepath>
@@ -768,11 +768,11 @@
<description>query for free busy on collection with Depth infinity</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/top-collection/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/freebusy/2.txt</filepath>
Modified: CalDAVTester/trunk/scripts/tests/depthreportsacl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/depthreportsacl.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/depthreportsacl.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -222,11 +222,11 @@
<description>multiget on top collection</description>
<request user='$userid2:' pswd='$pswd2:' print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/top-collection/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/depthreportsacl/4.xml</filepath>
@@ -255,11 +255,11 @@
<description>query on top collection</description>
<request user='$userid2:' pswd='$pswd2:' print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/top-collection/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/depthreportsacl/5.xml</filepath>
@@ -277,11 +277,11 @@
<description>query for free busy on collection with Depth infinity</description>
<request user='$userid2:' pswd='$pswd2:' print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/top-collection/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/top-collection/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/depthreportsacl/6.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/directory.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/directory.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/directory.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
<description>GET on root collection</description>
<request>
<method>GET</method>
- <ruri>/</ruri>
+ <ruri>$root:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -38,7 +38,7 @@
<description>GET on principals collection</description>
<request>
<method>GET</method>
- <ruri>/principals/</ruri>
+ <ruri>$principalcollection:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -48,7 +48,7 @@
<description>GET on user principals collection</description>
<request>
<method>GET</method>
- <ruri>/principals/users/</ruri>
+ <ruri>$principals_users:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -58,7 +58,7 @@
<description>GET on group principals collection</description>
<request>
<method>GET</method>
- <ruri>/principals/groups/</ruri>
+ <ruri>$principals_groups:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -68,7 +68,7 @@
<description>GET on locations principals collection</description>
<request>
<method>GET</method>
- <ruri>/principals/locations/</ruri>
+ <ruri>$principals_locations:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -78,7 +78,7 @@
<description>GET on resources principals collection</description>
<request>
<method>GET</method>
- <ruri>/principals/resources/</ruri>
+ <ruri>$principals_resources:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -88,7 +88,7 @@
<description>GET on __uids__ principals collection</description>
<request>
<method>GET</method>
- <ruri>/principals/__uids__/</ruri>
+ <ruri>$principals_uids:</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -102,7 +102,7 @@
<description>GET on calendars collection</description>
<request>
<method>GET</method>
- <ruri>/calendars/</ruri>
+ <ruri>$calendars:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -112,7 +112,7 @@
<description>GET on user calendars collection</description>
<request>
<method>GET</method>
- <ruri>/calendars/users/</ruri>
+ <ruri>$calendars_users:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -122,7 +122,7 @@
<description>GET on group calendars collection</description>
<request>
<method>GET</method>
- <ruri>/calendars/groups/</ruri>
+ <ruri>$calendars_groups:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -132,7 +132,7 @@
<description>GET on locations calendars collection</description>
<request>
<method>GET</method>
- <ruri>/calendars/locations/</ruri>
+ <ruri>$calendars_locations:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -142,7 +142,7 @@
<description>GET on resources calendars collection</description>
<request>
<method>GET</method>
- <ruri>/calendars/resources/</ruri>
+ <ruri>$calendars_resources:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -152,7 +152,7 @@
<description>GET on __uids__ calendars collection</description>
<request>
<method>GET</method>
- <ruri>/calendars/__uids__/</ruri>
+ <ruri>$calendars_uids:</ruri>
<verify>
<callback>statusCode</callback>
<arg>
Modified: CalDAVTester/trunk/scripts/tests/dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/dropbox.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/dropbox.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@
<description>Look for properties</description>
<request>
<method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/dropbox/1.xml</filepath>
@@ -41,7 +41,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>http://calendarserver.org/ns/dropbox-home-URL$<href xmlns="DAV:">$pathprefix1:/dropbox/</href></value>
+ <value>http://calendarserver.org/ns/dropbox-home-URL$<href xmlns="DAV:">$pathprefix1:/$dropbox:/</href></value>
</arg>
</verify>
</request>
@@ -52,11 +52,11 @@
<description>Look for properties</description>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$dropbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/dropbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/dropbox/2.xml</filepath>
@@ -76,7 +76,7 @@
<description>Create drop box</description>
<request end-delete='yes'>
<method>MKCOL</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -90,11 +90,11 @@
<description>Look for properties</description>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/dropbox/ABCEFG/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/dropbox/2.xml</filepath>
@@ -114,7 +114,7 @@
<description>Create drop box resource</description>
<request>
<method>PUT</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/test.xml</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/test.xml</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/dropbox/2.xml</filepath>
@@ -128,7 +128,7 @@
<description>Verify that user01 can read it</description>
<request>
<method>GET</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/test.xml</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/test.xml</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -138,7 +138,7 @@
<description>Verify that user03 cannot read it</description>
<request user='$userid2:' pswd='$pswd2:'>
<method>GET</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/test.xml</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/test.xml</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -152,7 +152,7 @@
<description>Add user02 read privilege on collection</description>
<request>
<method>ACL</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/dropbox/3.xml</filepath>
@@ -166,7 +166,7 @@
<description>Verify that user02 can now read it</description>
<request user='$userid2:' pswd='$pswd2:'>
<method>GET</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/test.xml</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/test.xml</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -176,7 +176,7 @@
<description>Verify that user03 cannot read it</description>
<request user='$userid3:' pswd='$pswd3:'>
<method>GET</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/test.xml</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/test.xml</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -190,7 +190,7 @@
<description>Add invalid user read privilege on collection</description>
<request>
<method>ACL</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/dropbox/8.xml</filepath>
@@ -208,7 +208,7 @@
<description>Add invalid user read privilege on collection</description>
<request>
<method>ACL</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/dropbox/9.xml</filepath>
@@ -228,7 +228,7 @@
<description>Try to create a calendar</description>
<request end-delete="yes">
<method>MKCALENDAR</method>
- <ruri>$pathprefix1:/dropbox/calendar/</ruri>
+ <ruri>$pathprefix1:/$dropbox:/calendar/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -242,7 +242,7 @@
<description>Try to create a resource</description>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/dropbox/test.xml</ruri>
+ <ruri>$pathprefix1:/$dropbox:/test.xml</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/dropbox/2.xml</filepath>
@@ -262,7 +262,7 @@
<description>Try to create a calendar</description>
<request end-delete="yes">
<method>MKCALENDAR</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/calendar/</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/calendar/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -276,7 +276,7 @@
<description>Try to create a collection</description>
<request end-delete="yes">
<method>MKCOL</method>
- <ruri>$pathprefix1:/dropbox/ABCEFG/calendar/</ruri>
+ <ruri>$pathprefix1:/$dropbox:/ABCEFG/calendar/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
Modified: CalDAVTester/trunk/scripts/tests/encodedURIs.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/encodedURIs.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/encodedURIs.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -61,11 +61,11 @@
<description>COPY</description>
<request print-response='no' end-delete='yes'>
<method>COPY</method>
+ <ruri>$pathprefix1:/collection%201/2%20a.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/collection%201/2_2%20a.ics</value>
</header>
- <ruri>$pathprefix1:/collection%201/2%20a.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -79,11 +79,11 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/collection%201/2_2%20a.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/collection%201/2_2%20a.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/propfinds/1.txt</filepath>
@@ -108,11 +108,11 @@
<description>MOVE</description>
<request print-response='no' end-delete='yes'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/collection%201/2%20a.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/collection%201/2_3%20a.ics</value>
</header>
- <ruri>$pathprefix1:/collection%201/2%20a.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -126,11 +126,11 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/collection%201/2_2%20a.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/collection%201/2_2%20a.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/propfinds/1.txt</filepath>
@@ -158,7 +158,7 @@
<description>PUT</description>
<request print-response='no' end-delete='yes'>
<method>PUT</method>
- <ruri>2%20a.ics</ruri>
+ <ruri>$calendarpath1:/2%20a.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/2.txt</filepath>
@@ -179,6 +179,7 @@
<description>PROPFIND</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -204,6 +205,7 @@
<description>multiget REPORT</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/multiget/encoded1.xml</filepath>
@@ -224,11 +226,11 @@
<description>COPY</description>
<request print-response='no' end-delete='yes'>
<method>COPY</method>
+ <ruri>$calendarpath1:/2%20a.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar%202/2_2%20a.ics</value>
</header>
- <ruri>2%20a.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -242,11 +244,11 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/calendar%202/2_2%20a.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/calendar%202/2_2%20a.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/propfinds/1.txt</filepath>
@@ -271,11 +273,11 @@
<description>MOVE</description>
<request print-response='no' end-delete='yes'>
<method>MOVE</method>
+ <ruri>$calendarpath1:/2%20a.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar%203/2_3%20a.ics</value>
</header>
- <ruri>2%20a.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -289,11 +291,11 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/calendar%203/2_3%20a.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/calendar%203/2_3%20a.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/propfinds/1.txt</filepath>
Modified: CalDAVTester/trunk/scripts/tests/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/errors.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/errors.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/6.ics</filepath>
@@ -133,7 +133,7 @@
<description>PUT non-calendar data</description>
<request>
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/1.xml</filepath>
@@ -151,7 +151,7 @@
<description>PUT invalid calendar data</description>
<request>
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/2.ics</filepath>
@@ -169,7 +169,7 @@
<description>PUT with multiple component types</description>
<request>
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/3.ics</filepath>
@@ -187,7 +187,7 @@
<description>PUT with METHOD property</description>
<request>
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/4.ics</filepath>
@@ -205,7 +205,7 @@
<description>PUT with different uids in same resource</description>
<request>
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/5.ics</filepath>
@@ -223,7 +223,7 @@
<description>PUT with duplicate uids</description>
<request print-response='no'>
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/6.ics</filepath>
@@ -241,7 +241,7 @@
<description>PUT with different uid onto existing resource</description>
<request print-response='no'>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/7.ics</filepath>
@@ -259,7 +259,7 @@
<description>PUT with too many recurrence instances to new resource</description>
<request print-response='no'>
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/8.ics</filepath>
@@ -277,7 +277,7 @@
<description>PUT with too many recurrence instances to existing resource</description>
<request print-response='no'>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/9.ics</filepath>
@@ -295,7 +295,7 @@
<description>PUT without timezone</description>
<request print-response='no'>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/28.ics</filepath>
@@ -313,7 +313,7 @@
<description>PUT invalid RRULE</description>
<request end-delete="yes" print-response='no'>
<method>PUT</method>
- <ruri>33.ics</ruri>
+ <ruri>$calendarpath1:/33.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/33.ics</filepath>
@@ -331,7 +331,7 @@
<description>PUT duplicate RECURRENCE-ID</description>
<request end-delete="yes" print-response='no'>
<method>PUT</method>
- <ruri>34.ics</ruri>
+ <ruri>$calendarpath1:/34.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/34.ics</filepath>
@@ -349,7 +349,7 @@
<description>PUT bad escape sequence</description>
<request end-delete="yes" print-response='no'>
<method>PUT</method>
- <ruri>34.ics</ruri>
+ <ruri>$calendarpath1:/34.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/36.ics</filepath>
@@ -370,11 +370,11 @@
<description>COPY non-calendar data</description>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/1.xml</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>$pathprefix1:/1.xml</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -388,11 +388,11 @@
<description>COPY invalid calendar data</description>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/2.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>$pathprefix1:/2.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -406,11 +406,11 @@
<description>COPY with multiple component types</description>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/3.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>$pathprefix1:/3.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -424,11 +424,11 @@
<description>COPY with METHOD property</description>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/4.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>$pathprefix1:/4.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -442,11 +442,11 @@
<description>COPY with different uids in same resource</description>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/5.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>$pathprefix1:/5.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -460,11 +460,11 @@
<description>COPY with duplicate uids</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$pathprefix1:/6.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>$pathprefix1:/6.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -478,11 +478,11 @@
<description>COPY from calendar with duplicate uids</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$pathprefix1:/calendar2/6.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/copy1.ics</value>
+ <value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>$pathprefix1:/calendar2/6.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -496,11 +496,11 @@
<description>COPY with different uid onto existing resource</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$pathprefix1:/7.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/1.ics</value>
+ <value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/7.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -514,11 +514,11 @@
<description>COPY from calendar with different uid onto existing resource</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$pathprefix1:/calendar2/7.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/1.ics</value>
+ <value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/calendar2/7.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -532,11 +532,11 @@
<description>COPY with too many recurrence instances to new resource</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$pathprefix1:/8.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/2.ics</value>
+ <value>$host:$calendarpath1:/2.ics</value>
</header>
- <ruri>$pathprefix1:/8.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -550,11 +550,11 @@
<description>COPY with too many recurrence instances to existing resource</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$pathprefix1:/9.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/1.ics</value>
+ <value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/9.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -568,11 +568,11 @@
<description>COPY calendar into calendar</description>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/calendar2/</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/calendar2/</value>
+ <value>$host:$calendarpath1:/calendar2/</value>
</header>
- <ruri>$pathprefix1:/calendar2/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -586,11 +586,11 @@
<description>COPY collection into calendar</description>
<request>
<method>COPY</method>
+ <ruri>$pathprefix1:/collection/</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/collection/</value>
+ <value>$host:$calendarpath1:/collection/</value>
</header>
- <ruri>$pathprefix1:/collection/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -607,11 +607,11 @@
<description>MOVE non-calendar data</description>
<request>
<method>MOVE</method>
+ <ruri>$pathprefix1:/1.xml</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
- <ruri>$pathprefix1:/1.xml</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -625,11 +625,11 @@
<description>MOVE invalid calendar data</description>
<request>
<method>MOVE</method>
+ <ruri>$pathprefix1:/2.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
- <ruri>$pathprefix1:/2.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -643,11 +643,11 @@
<description>MOVE with multiple component types</description>
<request>
<method>MOVE</method>
+ <ruri>$pathprefix1:/3.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
- <ruri>$pathprefix1:/3.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -661,11 +661,11 @@
<description>MOVE with METHOD property</description>
<request>
<method>MOVE</method>
+ <ruri>$pathprefix1:/4.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
- <ruri>$pathprefix1:/4.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -679,11 +679,11 @@
<description>MOVE with different uids in same resource</description>
<request>
<method>MOVE</method>
+ <ruri>$pathprefix1:/5.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
- <ruri>$pathprefix1:/5.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -697,11 +697,11 @@
<description>MOVE with duplicate uids</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/6.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
- <ruri>$pathprefix1:/6.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -715,11 +715,11 @@
<description>MOVE from calendar with duplicate uids</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/calendar2/6.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/move1.ics</value>
+ <value>$host:$calendarpath1:/move1.ics</value>
</header>
- <ruri>$pathprefix1:/calendar2/6.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -733,11 +733,11 @@
<description>MOVE with different uid onto existing resource</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/7.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/1.ics</value>
+ <value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/7.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -751,11 +751,11 @@
<description>MOVE from calendar with different uid onto existing resource</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/calendar2/7.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/1.ics</value>
+ <value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/calendar2/7.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -769,11 +769,11 @@
<description>MOVE with too many recurrence instances to new resource</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/8.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/2.ics</value>
+ <value>$host:$calendarpath1:/2.ics</value>
</header>
- <ruri>$pathprefix1:/8.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -787,11 +787,11 @@
<description>MOVE with too many recurrence instances to existing resource</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/9.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/1.ics</value>
+ <value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/9.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -805,11 +805,11 @@
<description>MOVE calendar into calendar</description>
<request>
<method>MOVE</method>
+ <ruri>$pathprefix1:/calendar2/</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/calendar2/</value>
+ <value>$host:$calendarpath1:/calendar2/</value>
</header>
- <ruri>$pathprefix1:/calendar2/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -823,11 +823,11 @@
<description>MOVE collection into calendar</description>
<request>
<method>MOVE</method>
+ <ruri>$pathprefix1:/collection/</ruri>
<header>
<name>Destination</name>
- <value>$host:$pathprefix1:/calendar/collection/</value>
+ <value>$host:$calendarpath1:/collection/</value>
</header>
- <ruri>$pathprefix1:/collection/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -844,6 +844,7 @@
<description>query with invalid calendar-data content-type</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/10.xml</filepath>
@@ -861,6 +862,7 @@
<description>query with invalid calendar-data version</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/11.xml</filepath>
@@ -878,6 +880,7 @@
<description>multiget with invalid calendar-data content-type</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/12.xml</filepath>
@@ -895,6 +898,7 @@
<description>multiget with invalid calendar-data version</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/13.xml</filepath>
@@ -915,6 +919,7 @@
<description>query with invalid filter</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/14.xml</filepath>
@@ -932,6 +937,7 @@
<description>query with invalid filter</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/15.xml</filepath>
@@ -949,6 +955,7 @@
<description>query with invalid filter</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/16.xml</filepath>
@@ -966,6 +973,7 @@
<description>query with invalid filter</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/17.xml</filepath>
@@ -983,6 +991,7 @@
<description>query with invalid filter</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/18.xml</filepath>
@@ -1000,6 +1009,7 @@
<description>query with invalid filter</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/19.xml</filepath>
@@ -1017,6 +1027,7 @@
<description>query with invalid filter</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/20.xml</filepath>
@@ -1034,6 +1045,7 @@
<description>query with invalid filter</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/21.xml</filepath>
@@ -1051,6 +1063,7 @@
<description>query with invalid filter</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/22.xml</filepath>
@@ -1068,6 +1081,7 @@
<description>query with invalid time-range (dates)</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/29.xml</filepath>
@@ -1085,6 +1099,7 @@
<description>query with invalid time-range (floating)</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/30.xml</filepath>
@@ -1102,6 +1117,7 @@
<description>free-busy with invalid time-range (dates)</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/31.xml</filepath>
@@ -1119,6 +1135,7 @@
<description>free-busy with invalid time-range (floating)</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/32.xml</filepath>
@@ -1207,6 +1224,7 @@
<description>query with invalid timezone</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/26.xml</filepath>
@@ -1224,6 +1242,7 @@
<description>proppatch with invalid timezone</description>
<request print-response='no'>
<method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/errors/27.xml</filepath>
@@ -1265,7 +1284,7 @@
<description>DELETE /</description>
<request print-response='no'>
<method>DELETE</method>
- <ruri>/</ruri>
+ <ruri>$root:</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -1279,11 +1298,11 @@
<description>COPY /</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$root:</ruri>
<header>
<name>Destination</name>
<value>/copy/</value>
</header>
- <ruri>/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -1297,11 +1316,11 @@
<description>MOVE /</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$root:</ruri>
<header>
<name>Destination</name>
<value>/move/</value>
</header>
- <ruri>/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
Modified: CalDAVTester/trunk/scripts/tests/expandproperty.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/expandproperty.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/expandproperty.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -178,11 +178,11 @@
<description>Wrong Depth 1</description>
<request print-response="no">
<method>REPORT</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/expandproperty/1.xml</filepath>
@@ -200,11 +200,11 @@
<description>Wrong Depth infinity</description>
<request print-response="no">
<method>REPORT</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/expandproperty/1.xml</filepath>
@@ -243,7 +243,7 @@
<description>Non-expanding group-member-set query</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$uids:toplevelgroup/</ruri>
+ <ruri>$principals_uids:toplevelgroup/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/expandproperty/9.xml</filepath>
@@ -256,7 +256,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:toplevelgroup/</value>
+ <value>$principals_uids:toplevelgroup/</value>
</arg>
</verify>
<verify>
@@ -293,7 +293,7 @@
<description>Expanding group-member-set query</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$uids:toplevelgroup/</ruri>
+ <ruri>$principals_uids:toplevelgroup/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/expandproperty/10.xml</filepath>
@@ -306,7 +306,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$uids:toplevelgroup/</value>
+ <value>$principals_uids:toplevelgroup/</value>
</arg>
</verify>
<verify>
Modified: CalDAVTester/trunk/scripts/tests/floating.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/floating.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/floating.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -312,11 +312,11 @@
<description>REPORT on non-recurring timed/floating events: no timezone</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/floating/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/floating/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/floating/1.txt</filepath>
@@ -345,11 +345,11 @@
<description>REPORT on non-recurring timed/floating events: US/Eastern</description>
<request>
<method>REPORT</method>
+ <ruri>$pathprefix1:/floating/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/floating/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/floating/1.txt</filepath>
@@ -378,11 +378,11 @@
<description>REPORT on non-recurring timed/floating events: US/Pacific</description>
<request>
<method>REPORT</method>
+ <ruri>$pathprefix1:/floating/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/floating/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/floating/2.txt</filepath>
@@ -412,11 +412,11 @@
<description>REPORT on non-recurring timed/floating events: no timezone</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/floating/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/floating/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/floating/6.xml</filepath>
@@ -446,11 +446,11 @@
<description>free-busy on collection without timezone</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/floating/calendar-none/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/floating/calendar-none/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/floating/5.txt</filepath>
@@ -498,11 +498,11 @@
<description>free-busy on multiple collections with/without timezone</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$pathprefix1:/floating/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/floating/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/floating/5.txt</filepath>
Modified: CalDAVTester/trunk/scripts/tests/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/get.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/get.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -45,7 +45,7 @@
<description>GET from calendar collection</description>
<request>
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -119,7 +119,7 @@
<description>GET on calendar collection without multiple VTIMEZONEs</description>
<request end-delete="yes">
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/4.txt</filepath>
Modified: CalDAVTester/trunk/scripts/tests/ical-client.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/ical-client.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/ical-client.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@
<description>PROPFIND principal - no authentication</description>
<request auth="no">
<method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ical-client/1.xml</filepath>
@@ -50,11 +50,11 @@
<description>PROPFIND principal - with authentication</description>
<request>
<method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ical-client/1.xml</filepath>
@@ -75,11 +75,11 @@
<description>PROPFIND calendar home</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ical-client/2.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/implicitacls.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitacls.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitacls.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@
<description>Look for CALDAV:schedule-send on Outbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/outbox/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/outbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/acls/1.xml</filepath>
@@ -51,11 +51,11 @@
<description>Look for CALDAV:schedule-send on Outbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/inbox/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/inbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/acls/1.xml</filepath>
@@ -77,11 +77,11 @@
<description>Look for CALDAV:schedule-send on Outbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/outbox/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/outbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/acls/2.xml</filepath>
@@ -100,11 +100,11 @@
<description>Look for CALDAV:schedule-send on Outbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/inbox/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/inbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/acls/2.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/implicitauto1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto1.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitauto1.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</start>
@@ -103,11 +103,11 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -125,7 +125,7 @@
<description>One item in user02 calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -157,7 +157,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -246,11 +246,11 @@
<description>No items in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -268,7 +268,7 @@
<description>One item in user02 calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -300,7 +300,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -382,11 +382,11 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -404,7 +404,7 @@
<description>One item in user02 calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -436,7 +436,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -518,11 +518,11 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -540,7 +540,7 @@
<description>One item in user02 calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -572,7 +572,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -654,11 +654,11 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -676,7 +676,7 @@
<description>One item in user02 calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -708,7 +708,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -790,11 +790,11 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -812,7 +812,7 @@
<description>One item in user02 calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -844,7 +844,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -926,11 +926,11 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -948,7 +948,7 @@
<description>One item in user02 calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -980,7 +980,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -1012,11 +1012,11 @@
<description>getctag on resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rcalendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -1031,11 +1031,11 @@
<description>getctag on resource01 inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -1050,11 +1050,11 @@
<description>Six items in user02 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/calendar/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -1072,11 +1072,11 @@
<description>Six items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rcalendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -1140,11 +1140,11 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -1162,11 +1162,11 @@
<description>Five items in user02 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/calendar/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -1202,11 +1202,11 @@
<description>Five items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rcalendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -1224,11 +1224,11 @@
<description>Test getctag on resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rcalendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -1246,11 +1246,11 @@
<description>getctag on resource01 inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -1288,7 +1288,7 @@
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1296,7 +1296,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -1304,7 +1304,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/implicitauto2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto2.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitauto2.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</start>
@@ -109,7 +109,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -209,7 +209,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -309,7 +309,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -409,7 +409,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -509,7 +509,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -609,7 +609,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -709,7 +709,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -809,7 +809,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -843,7 +843,7 @@
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -851,7 +851,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -859,7 +859,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/implicitauto3.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto3.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitauto3.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</start>
@@ -109,7 +109,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -209,7 +209,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -309,7 +309,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -409,7 +409,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -509,7 +509,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -609,7 +609,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -709,7 +709,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -809,7 +809,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -843,7 +843,7 @@
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -851,7 +851,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -859,7 +859,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/implicitauto4.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto4.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitauto4.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</start>
@@ -109,7 +109,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -209,7 +209,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -309,7 +309,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -343,7 +343,7 @@
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -351,7 +351,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -359,7 +359,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/implicitcalendartransp.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitcalendartransp.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitcalendartransp.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@
<description>Look for property on new calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/testcalendar/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/testcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/1.xml</filepath>
@@ -78,11 +78,11 @@
<description>Look for property on new calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/testcalendar/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/testcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/1.xml</filepath>
@@ -103,11 +103,11 @@
<description>Look for property on new calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/1.xml</filepath>
@@ -138,11 +138,11 @@
<description>Look for property on new calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/testcalendar2/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/testcalendar2/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/1.xml</filepath>
@@ -160,11 +160,11 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/3.xml</filepath>
@@ -200,11 +200,11 @@
<description>Look for property on new calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/testcalendar2/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/testcalendar2/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/1.xml</filepath>
@@ -222,11 +222,11 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/3.xml</filepath>
@@ -262,11 +262,11 @@
<description>Look for property on new calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/testcalendar2/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/testcalendar2/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/1.xml</filepath>
@@ -284,11 +284,11 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/3.xml</filepath>
@@ -324,11 +324,11 @@
<description>Look for property on new calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/testcalendar2/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/testcalendar2/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/1.xml</filepath>
@@ -346,11 +346,11 @@
<description>Move new calendar</description>
<request print-response="no">
<method>MOVE</method>
+ <ruri>$pathprefix1:/testcalendar2/</ruri>
<header>
<name>Destination</name>
<value>$pathprefix1:/testcalendar3/</value>
</header>
- <ruri>$pathprefix1:/testcalendar2/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -360,11 +360,11 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/3.xml</filepath>
@@ -400,11 +400,11 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/3.xml</filepath>
@@ -423,11 +423,11 @@
<description>Look for free-busy-set fro default calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/calendartransp/3.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -73,11 +73,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/compatibility/3.xml</filepath>
@@ -151,11 +151,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/compatibility/3.xml</filepath>
@@ -208,11 +208,11 @@
<description>Organizer adds VALARM to one instance</description>
<request print-response='no'>
<method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>If-Match</name>
<value>$etag-organizer:</value>
</header>
- <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/compatibility/7.ics</filepath>
@@ -240,11 +240,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/compatibility/3.xml</filepath>
@@ -262,7 +262,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -270,7 +270,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -282,11 +282,11 @@
<end>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<ruri>$pathprefix1:/$inbox:/</ruri>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$pathprefix2:/$inbox:/</ruri>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
<ruri>$pathprefix3:/$inbox:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/implicitcopymove.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitcopymove.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitcopymove.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -81,11 +81,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -230,11 +230,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -252,11 +252,11 @@
<description>Attendee has no data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -295,7 +295,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -311,7 +311,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -389,7 +389,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -405,7 +405,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -455,11 +455,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -601,11 +601,11 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -623,7 +623,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -639,7 +639,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -689,11 +689,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -711,11 +711,11 @@
<description>Attendee no data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -761,11 +761,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -818,7 +818,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -834,7 +834,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -884,11 +884,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -941,11 +941,11 @@
<description>Organizer MOVES to another calendar</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar-2/2.ics</value>
</header>
- <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -955,11 +955,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -977,7 +977,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -993,7 +993,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1043,11 +1043,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1107,11 +1107,11 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>MOVE</method>
+ <ruri>$</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/calendar-2/2.ics</value>
</header>
- <ruri>$</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1121,11 +1121,11 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1143,7 +1143,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -1159,7 +1159,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1195,11 +1195,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1217,11 +1217,11 @@
<description>Organizer MOVES to calendar</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/collection/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/2.ics</value>
</header>
- <ruri>$pathprefix1:/collection/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1245,11 +1245,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1302,11 +1302,11 @@
<description>Organizer MOVES to collection</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/collection/1.ics</value>
</header>
- <ruri>$calendarpath1:/2.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1316,11 +1316,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1338,11 +1338,11 @@
<description>Attendee has no data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1381,7 +1381,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -1397,7 +1397,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1433,11 +1433,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1469,11 +1469,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1491,11 +1491,11 @@
<description>Organizer MOVES to calendar</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/collection/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/collection/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1519,11 +1519,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1590,11 +1590,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1612,11 +1612,11 @@
<description>Organizer MOVES to calendar</description>
<request print-response='no'>
<method>MOVE</method>
+ <ruri>$pathprefix1:/collection/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/collection/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1640,11 +1640,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1662,11 +1662,11 @@
<description>Attendee has no data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1705,7 +1705,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -1721,7 +1721,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1771,11 +1771,11 @@
<description>Organizer COPIES to a collection</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/collection/2.ics</value>
</header>
- <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1785,11 +1785,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1807,11 +1807,11 @@
<description>Organizer COPIES to a calendar</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar-2/2.ics</value>
</header>
- <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1821,11 +1821,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1861,11 +1861,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1883,7 +1883,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -1899,7 +1899,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1949,11 +1949,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -1971,11 +1971,11 @@
<description>Organizer COPIES to a collection</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/collection/2.ics</value>
</header>
- <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1985,11 +1985,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2007,11 +2007,11 @@
<description>Organizer COPIES to a calendar</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/calendar-2/2.ics</value>
</header>
- <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -2025,11 +2025,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2061,11 +2061,11 @@
<description>Attendee COPIES to a collection</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>COPY</method>
+ <ruri>$</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/collection/2.ics</value>
</header>
- <ruri>$</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2075,11 +2075,11 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2097,11 +2097,11 @@
<description>Attendee COPIES to a calendar</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>COPY</method>
+ <ruri>$</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix2:/calendar-2/2.ics</value>
</header>
- <ruri>$</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -2115,11 +2115,11 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2137,7 +2137,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -2153,7 +2153,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -2189,11 +2189,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2211,11 +2211,11 @@
<description>Organizer COPIES to calendar</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$pathprefix1:/collection/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/2.ics</value>
</header>
- <ruri>$pathprefix1:/collection/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2239,11 +2239,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2296,11 +2296,11 @@
<description>Organizer COPIES to collection</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$pathprefix1:/collection/2.ics</value>
</header>
- <ruri>$calendarpath1:/2.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2310,11 +2310,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2332,7 +2332,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -2348,7 +2348,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -2384,11 +2384,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2420,11 +2420,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2442,11 +2442,11 @@
<description>Organizer COPIES to calendar</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$pathprefix1:/collection/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/collection/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2470,11 +2470,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2541,11 +2541,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2563,11 +2563,11 @@
<description>Organizer COPIES to calendar</description>
<request print-response='no'>
<method>COPY</method>
+ <ruri>$pathprefix1:/collection/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/1.ics</value>
</header>
- <ruri>$pathprefix1:/collection/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2591,11 +2591,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2613,11 +2613,11 @@
<description>Attendee has no data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/copymove/put-restrictions/3.xml</filepath>
@@ -2656,7 +2656,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -2672,7 +2672,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@
<description>Look for empty property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
@@ -71,11 +71,11 @@
<description>Verify property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
@@ -96,11 +96,11 @@
<description>Look for empty property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
@@ -136,11 +136,11 @@
<description>Verify property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
@@ -179,11 +179,11 @@
<description>Verify property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -51,11 +51,11 @@
<description>Organizer deletes collection</description>
<request print-response='no'>
<method>DELETE</method>
+ <ruri>$pathprefix1:/collection/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/collection/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -106,11 +106,11 @@
<description>Organizer deletes collection</description>
<request print-response='no'>
<method>DELETE</method>
+ <ruri>$pathprefix1:/collection/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/collection/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -147,11 +147,11 @@
<description>Organizer deletes calendar</description>
<request print-response='no'>
<method>DELETE</method>
+ <ruri>$pathprefix1:/calendar2/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/calendar2/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -202,11 +202,11 @@
<description>Organizer deletes calendar</description>
<request print-response='no'>
<method>DELETE</method>
+ <ruri>$pathprefix1:/calendar2/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/calendar2/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -271,11 +271,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -328,11 +328,11 @@
<description>Organizer deletes calendar</description>
<request print-response='no'>
<method>DELETE</method>
+ <ruri>$pathprefix1:/calendar2/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/calendar2/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -356,11 +356,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -378,11 +378,11 @@
<description>Attendee has no data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -472,11 +472,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -529,11 +529,11 @@
<description>Organizer deletes calendar</description>
<request print-response='no'>
<method>DELETE</method>
+ <ruri>$pathprefix1:/collection/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/collection/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -557,11 +557,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -579,11 +579,11 @@
<description>Attendee has no data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -687,11 +687,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -772,11 +772,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -829,11 +829,11 @@
<description>Organizer deletes calendar</description>
<request print-response='no'>
<method>DELETE</method>
+ <ruri>$pathprefix1:/collection/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
</header>
- <ruri>$pathprefix1:/collection/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -857,11 +857,11 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -876,11 +876,11 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -898,11 +898,11 @@
<description>Attendees have no data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
@@ -917,11 +917,11 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath3:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/deletecalendar/3.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/impliciterrors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/impliciterrors.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/impliciterrors.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -85,7 +85,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitoptions.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitoptions.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitoptions.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: CalDAVTester/trunk/scripts/tests/implicitprivateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitprivateevents.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitprivateevents.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -65,11 +65,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/privateevents/3.xml</filepath>
@@ -154,11 +154,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/privateevents/3.xml</filepath>
@@ -250,11 +250,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/privateevents/3.xml</filepath>
@@ -272,7 +272,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -280,7 +280,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitproxy.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitproxy.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -103,11 +103,11 @@
<description>One item in user03 Inbox</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/proxy/4.xml</filepath>
@@ -216,11 +216,11 @@
<description>No item in user03 Inbox</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/proxy/4.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/implicitrecur1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitrecur1.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitrecur1.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -69,11 +69,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override_request/3.xml</filepath>
@@ -154,11 +154,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override_request/3.xml</filepath>
@@ -250,11 +250,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override_request/3.xml</filepath>
@@ -346,11 +346,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override_request/3.xml</filepath>
@@ -414,7 +414,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -422,7 +422,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -430,7 +430,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -472,11 +472,11 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override/3.xml</filepath>
@@ -491,11 +491,11 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override/3.xml</filepath>
@@ -591,11 +591,11 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override/3.xml</filepath>
@@ -621,11 +621,11 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override/3.xml</filepath>
@@ -654,11 +654,11 @@
<description>Attendees have no data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override/3.xml</filepath>
@@ -673,11 +673,11 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath3:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/recur1/override/3.xml</filepath>
@@ -695,7 +695,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -703,7 +703,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -711,7 +711,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitscenario1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitscenario1.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitscenario1.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -65,11 +65,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/simple/3.xml</filepath>
@@ -91,11 +91,11 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/simple/12.xml</filepath>
@@ -169,11 +169,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/simple/3.xml</filepath>
@@ -200,11 +200,11 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/simple/12.xml</filepath>
@@ -285,11 +285,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/simple/3.xml</filepath>
@@ -311,11 +311,11 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/simple/12.xml</filepath>
@@ -389,11 +389,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/simple/3.xml</filepath>
@@ -415,11 +415,11 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/simple/12.xml</filepath>
@@ -472,7 +472,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -480,7 +480,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -522,11 +522,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/organizerdelete/3.xml</filepath>
@@ -612,11 +612,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/organizerdelete/3.xml</filepath>
@@ -683,11 +683,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/organizerdelete/3.xml</filepath>
@@ -719,11 +719,11 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/simple/12.xml</filepath>
@@ -741,11 +741,11 @@
<description>Attendee data gone</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$calendarpath2:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/organizerdelete/3.xml</filepath>
@@ -784,7 +784,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -792,7 +792,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -834,11 +834,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/attendeedelete/3.xml</filepath>
@@ -912,11 +912,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/attendeedelete/3.xml</filepath>
@@ -990,11 +990,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/attendeedelete/3.xml</filepath>
@@ -1047,7 +1047,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -1055,7 +1055,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1097,11 +1097,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/alarms/3.xml</filepath>
@@ -1186,11 +1186,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/alarms/3.xml</filepath>
@@ -1282,11 +1282,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/alarms/3.xml</filepath>
@@ -1378,11 +1378,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/alarms/3.xml</filepath>
@@ -1442,11 +1442,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/alarms/3.xml</filepath>
@@ -1499,11 +1499,11 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/alarms/3.xml</filepath>
@@ -1535,7 +1535,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -1543,7 +1543,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1585,11 +1585,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/no-x-properties/3.xml</filepath>
@@ -1681,11 +1681,11 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/no-x-properties/3.xml</filepath>
@@ -1738,11 +1738,11 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario1/no-x-properties/3.xml</filepath>
@@ -1774,7 +1774,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -1782,7 +1782,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitscenario2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitscenario2.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitscenario2.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -69,11 +69,11 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario2/simple/3.xml</filepath>
@@ -88,11 +88,11 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario2/simple/3.xml</filepath>
@@ -195,11 +195,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario2/simple/3.xml</filepath>
@@ -252,11 +252,11 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario2/simple/3.xml</filepath>
@@ -309,11 +309,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario2/simple/3.xml</filepath>
@@ -366,11 +366,11 @@
<description>Attendee 1 no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scenario2/simple/3.xml</filepath>
@@ -402,7 +402,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -410,7 +410,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -418,7 +418,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -253,11 +253,11 @@
<description>Updated event has schedule tag header</description>
<request print-response="no">
<method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-organizer-new:</value>
</header>
- <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/5.ics</filepath>
@@ -342,11 +342,11 @@
<description>Updated event has schedule tag header</description>
<request print-response="no">
<method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-organizer-new:</value>
</header>
- <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/5.ics</filepath>
@@ -427,11 +427,11 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PUT</method>
+ <ruri>$</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-attendee-new:</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/6.ics</filepath>
@@ -512,11 +512,11 @@
<description>Updated event has schedule tag header</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PUT</method>
+ <ruri>$</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-attendee-new:</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/5.ics</filepath>
@@ -629,9 +629,9 @@
<description>Clean-up</description>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<ruri>$pathprefix1:/$inbox:/</ruri>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$pathprefix2:/$inbox:/</ruri>
</request>
</test>
@@ -766,11 +766,11 @@
<description>Updated event has changed schedule tag header</description>
<request print-response="no">
<method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-organizer:</value>
</header>
- <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/8.ics</filepath>
@@ -916,11 +916,11 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PUT</method>
+ <ruri>$</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-attendee02:</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/10.ics</filepath>
@@ -1058,11 +1058,11 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PUT</method>
+ <ruri>$</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-attendee03:</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/11.ics</filepath>
@@ -1193,11 +1193,11 @@
<description>Updated event that has changed on disk</description>
<request print-response="no">
<method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-organizer:</value>
</header>
- <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/12.ics</filepath>
@@ -1294,11 +1294,11 @@
<description>Updated event that has changed on disk</description>
<request print-response="no">
<method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-organizer:</value>
</header>
- <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/16.ics</filepath>
@@ -1427,11 +1427,11 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PUT</method>
+ <ruri>$</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-attendee02:</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/18.ics</filepath>
@@ -1463,11 +1463,11 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PUT</method>
+ <ruri>$</ruri>
<header>
<name>If-Schedule-Tag-Match</name>
<value>$schedule-tag-attendee03:</value>
</header>
- <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/scheduletag/19.ics</filepath>
@@ -1507,11 +1507,11 @@
<end>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<ruri>$pathprefix1:/$inbox:/</ruri>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$pathprefix2:/$inbox:/</ruri>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
<ruri>$pathprefix3:/$inbox:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/mkcalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/mkcalendar.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/mkcalendar.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: CalDAVTester/trunk/scripts/tests/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/nonascii.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/nonascii.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -306,7 +306,7 @@
<description>PUT with non-ascii data</description>
<request end-delete="yes">
<method>PUT</method>
- <ruri>nonascii.ics</ruri>
+ <ruri>$calendarpath1:/nonascii.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/nonascii/6.ics</filepath>
@@ -320,7 +320,7 @@
<description>GET with non-ascii data</description>
<request>
<method>GET</method>
- <ruri>nonascii.ics</ruri>
+ <ruri>$calendarpath1:/nonascii.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -330,6 +330,7 @@
<description>Basic query with non-ascii data</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/nonascii/7.xml</filepath>
@@ -347,6 +348,7 @@
<description>Text query with ascii data</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/nonascii/8.xml</filepath>
@@ -364,6 +366,7 @@
<description>Text query with non-ascii data</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/nonascii/9.xml</filepath>
@@ -384,7 +387,7 @@
<description>PUT with non-utf-8 data without charset</description>
<request end-delete="yes">
<method>PUT</method>
- <ruri>nonutf8.ics</ruri>
+ <ruri>$calendarpath1:/nonutf8.ics</ruri>
<data>
<content-type>text/calendar</content-type>
<filepath>Resource/nonascii/10.ics</filepath>
@@ -402,7 +405,7 @@
<description>PUT with non-utf-8 data with utf-8 charset</description>
<request end-delete="yes">
<method>PUT</method>
- <ruri>nonutf8.ics</ruri>
+ <ruri>$calendarpath1:/nonutf8.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/nonascii/10.ics</filepath>
@@ -420,7 +423,7 @@
<description>PUT with non-utf-8 data with non-utf-8 charset</description>
<request end-delete="yes">
<method>PUT</method>
- <ruri>nonutf8.ics</ruri>
+ <ruri>$calendarpath1:/nonutf8.ics</ruri>
<data>
<content-type>text/calendar; charset=iso-8859-1</content-type>
<filepath>Resource/nonascii/10.ics</filepath>
@@ -455,11 +458,11 @@
<description>COPY non-utf-8 data to calendar collection</description>
<request end-delete="yes">
<method>COPY</method>
+ <ruri>$pathprefix1:/collection/nonutf8.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>$pathprefix1:/collection/nonutf8.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -473,11 +476,11 @@
<description>MOVE non-utf-8 data to calendar collection</description>
<request end-delete="yes">
<method>MOVE</method>
+ <ruri>$pathprefix1:/collection/nonutf8.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarpath1:/copy1.ics</value>
</header>
- <ruri>$pathprefix1:/collection/nonutf8.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
Modified: CalDAVTester/trunk/scripts/tests/populate.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/populate.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/populate.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: CalDAVTester/trunk/scripts/tests/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privatecomments.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/privatecomments.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -86,11 +86,11 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -105,11 +105,11 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -212,11 +212,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -269,11 +269,11 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -329,11 +329,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -386,11 +386,11 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -446,11 +446,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -503,11 +503,11 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -563,11 +563,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -620,11 +620,11 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -680,11 +680,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -737,11 +737,11 @@
<description>Attendee 1 no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -797,11 +797,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -854,11 +854,11 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -890,7 +890,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -898,7 +898,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -906,7 +906,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -948,11 +948,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -1026,11 +1026,11 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -1083,7 +1083,7 @@
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -1091,7 +1091,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1099,7 +1099,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -1142,11 +1142,11 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -1304,11 +1304,11 @@
<description>Organizer Inbox Items</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privatecomments/3.xml</filepath>
@@ -1411,7 +1411,7 @@
<end>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -1419,7 +1419,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1427,7 +1427,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privateevents.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/privateevents.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -24,7 +24,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -198,11 +198,11 @@
<description>Check for no DAV:owner on root</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$root:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/2.xml</filepath>
@@ -220,11 +220,11 @@
<description>Check for no DAV:owner on user calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$calendars_uids:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$usercalendars:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/2.xml</filepath>
@@ -242,11 +242,11 @@
<description>Check for no DAV:owner on principal</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/2.xml</filepath>
@@ -264,11 +264,11 @@
<description>Check for DAV:owner on calendar home</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/2.xml</filepath>
@@ -286,11 +286,11 @@
<description>Check for DAV:owner on calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/2.xml</filepath>
@@ -308,11 +308,11 @@
<description>Check for DAV:owner on calendar resource</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/2.xml</filepath>
@@ -330,11 +330,11 @@
<description>Check for DAV:owner on other user's calendar</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/2.xml</filepath>
@@ -452,11 +452,11 @@
<description>PROPFIND by user01</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -475,11 +475,11 @@
<description>PROPFIND by user02</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -498,11 +498,11 @@
<description>PROPFIND by user03</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -633,11 +633,11 @@
<description>PROPFIND by user01</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -657,11 +657,11 @@
<description>PROPFIND by user02</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -681,11 +681,11 @@
<description>PROPFIND by user03</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -943,11 +943,11 @@
<description>PROPFIND by user01</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -968,11 +968,11 @@
<description>PROPFIND by user02</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -992,11 +992,11 @@
<description>PROPFIND by user03</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -1130,7 +1130,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 1</value>
<value>LOCATION:confidential 1</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -1230,11 +1230,11 @@
<description>PROPFIND by user01</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -1256,11 +1256,11 @@
<description>PROPFIND by user02</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -1281,11 +1281,11 @@
<description>PROPFIND by user03</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -1336,7 +1336,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -1448,7 +1448,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event restricted access 1</value>
<value>LOCATION:restricted 1</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -1548,11 +1548,11 @@
<description>PROPFIND by user01</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -1575,11 +1575,11 @@
<description>PROPFIND by user02</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -1601,11 +1601,11 @@
<description>PROPFIND by user03</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/sharedcalendar/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/sharedcalendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/privateevents/1.xml</filepath>
@@ -1657,7 +1657,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event restricted access 2</value>
<value>LOCATION:restricted 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -1900,7 +1900,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -1927,8 +1927,8 @@
<name>notcontains</name>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -1955,8 +1955,8 @@
<name>notcontains</name>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -1983,7 +1983,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event restricted access 2</value>
<value>LOCATION:restricted 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2010,8 +2010,8 @@
</arg>
<arg>
<name>notcontains</name>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2038,8 +2038,8 @@
</arg>
<arg>
<name>notcontains</name>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2065,7 +2065,7 @@
<value>VERSION:2.0</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
<arg>
@@ -2096,8 +2096,8 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2124,8 +2124,8 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2151,7 +2151,7 @@
<value>VERSION:2.0</value>
<value>SUMMARY:event restricted access 2</value>
<value>LOCATION:restricted 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
<arg>
@@ -2182,8 +2182,8 @@
<arg>
<name>notcontains</name>
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2210,8 +2210,8 @@
<arg>
<name>notcontains</name>
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2374,7 +2374,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2401,8 +2401,8 @@
<name>notcontains</name>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2429,8 +2429,8 @@
<name>notcontains</name>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2457,7 +2457,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event restricted access 2</value>
<value>LOCATION:restricted 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2484,8 +2484,8 @@
</arg>
<arg>
<name>notcontains</name>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2512,8 +2512,8 @@
</arg>
<arg>
<name>notcontains</name>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2539,7 +2539,7 @@
<value>VERSION:2.0</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
<arg>
@@ -2570,8 +2570,8 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2598,8 +2598,8 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2625,7 +2625,7 @@
<value>VERSION:2.0</value>
<value>SUMMARY:event restricted access 2</value>
<value>LOCATION:restricted 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
<arg>
@@ -2656,8 +2656,8 @@
<arg>
<name>notcontains</name>
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2684,8 +2684,8 @@
<arg>
<name>notcontains</name>
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
- <value>ATTENDEE:mailto:user02 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
+ <value>ATTENDEE:$cuaddr2:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -2931,11 +2931,11 @@
<description>copy to calendar</description>
<request print-response="no">
<method>COPY</method>
+ <ruri>$pathprefix1:/fromcalendar/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/copycalendar/1.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2945,11 +2945,11 @@
<description>copy to calendar</description>
<request print-response="no">
<method>COPY</method>
+ <ruri>$pathprefix1:/fromcalendar/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/copycalendar/2.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/2.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2959,11 +2959,11 @@
<description>copy to calendar</description>
<request print-response="no">
<method>COPY</method>
+ <ruri>$pathprefix1:/fromcalendar/3.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/copycalendar/3.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/3.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2973,11 +2973,11 @@
<description>copy to calendar</description>
<request print-response="no">
<method>COPY</method>
+ <ruri>$pathprefix1:/fromcalendar/4.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/copycalendar/4.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/4.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2987,11 +2987,11 @@
<description>copy to calendar</description>
<request print-response="no">
<method>COPY</method>
+ <ruri>$pathprefix1:/fromcalendar/5.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/copycalendar/5.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/5.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -3301,11 +3301,11 @@
<description>move to calendar</description>
<request print-response="no">
<method>MOVE</method>
+ <ruri>$pathprefix1:/fromcalendar/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/movecalendar/1.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -3315,11 +3315,11 @@
<description>move to calendar</description>
<request print-response="no">
<method>MOVE</method>
+ <ruri>$pathprefix1:/fromcalendar/2.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/movecalendar/2.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/2.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -3329,11 +3329,11 @@
<description>move to calendar</description>
<request print-response="no">
<method>MOVE</method>
+ <ruri>$pathprefix1:/fromcalendar/3.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/movecalendar/3.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/3.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -3343,11 +3343,11 @@
<description>move to calendar</description>
<request print-response="no">
<method>MOVE</method>
+ <ruri>$pathprefix1:/fromcalendar/4.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/movecalendar/4.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/4.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -3357,11 +3357,11 @@
<description>move to calendar</description>
<request print-response="no">
<method>MOVE</method>
+ <ruri>$pathprefix1:/fromcalendar/5.ics</ruri>
<header>
<name>Destination</name>
<value>$host:/$pathprefix1:/movecalendar/5.ics</value>
</header>
- <ruri>$pathprefix1:/fromcalendar/5.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -3844,7 +3844,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -3867,7 +3867,7 @@
<value>VERSION:2.0</value>
<value>SUMMARY:event restricted access 2</value>
<value>LOCATION:restricted 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
<arg>
@@ -3939,7 +3939,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event confidential access 2</value>
<value>LOCATION:confidential 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
@@ -3963,7 +3963,7 @@
<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
<value>SUMMARY:event restricted access 2</value>
<value>LOCATION:restricted 2</value>
- <value>ORGANIZER:mailto:user01 at example.com</value>
+ <value>ORGANIZER:$cuaddr1:</value>
<value>BEGIN:VALARM</value>
</arg>
</verify>
Modified: CalDAVTester/trunk/scripts/tests/propfind.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/propfind.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/propfind.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
<description>PROPFIND of basic properties depth=0</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -43,6 +44,7 @@
<description>PROPFIND of basic properties depth=1</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -60,6 +62,7 @@
<description>PROPFIND of basic properties depth=infinity</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
@@ -77,6 +80,7 @@
<description>PROPFIND getcontentlength=0</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -101,6 +105,7 @@
<description>PROPFIND of property names depth=0</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -118,6 +123,7 @@
<description>PROPFIND of property names depth=1</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -135,6 +141,7 @@
<description>PROPFIND of property names depth=infinity</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
@@ -155,6 +162,7 @@
<description>PROPFIND of all properties depth=0</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -172,6 +180,7 @@
<description>PROPFIND of all properties depth=1</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -189,6 +198,7 @@
<description>PROPFIND of all properties depth=infinity</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
@@ -209,6 +219,7 @@
<description>PROPFIND with invalid elements</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -230,6 +241,7 @@
<description>PROPFIND of unknown element</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -251,6 +263,7 @@
<description>PROPFIND with one unknown property</description>
<request>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
Modified: CalDAVTester/trunk/scripts/tests/proppatch.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/proppatch.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/proppatch.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
<description>PROPPATCH of details: good</description>
<request print-response='no'>
<method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/proppatches/1.xml</filepath>
@@ -41,6 +42,7 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -63,6 +65,7 @@
<description>PROPPATCH of details: remove it</description>
<request print-response='no'>
<method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/proppatches/3.xml</filepath>
@@ -77,6 +80,7 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -102,6 +106,7 @@
<description>PROPPATCH remove non-existant</description>
<request print-response='no'>
<method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/proppatches/4.xml</filepath>
@@ -119,6 +124,7 @@
<description>PROPPATCH of resourcetype: fails</description>
<request print-response='no'>
<method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/proppatches/5.xml</filepath>
@@ -135,6 +141,7 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -160,6 +167,7 @@
<description>PROPPATCH of encoded value</description>
<request print-response='no'>
<method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/proppatches/8.xml</filepath>
@@ -174,6 +182,7 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -198,6 +207,7 @@
<description>PROPPATCH with property XML attribute</description>
<request print-response='no'>
<method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/proppatches/6.xml</filepath>
@@ -212,6 +222,7 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -240,6 +251,7 @@
<description>PROPPATCH of details: remove it</description>
<request print-response='no'>
<method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/proppatches/3.xml</filepath>
@@ -254,6 +266,7 @@
</request>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
Modified: CalDAVTester/trunk/scripts/tests/proxyauthz.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/proxyauthz.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/proxyauthz.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/delete/1.txt</filepath>
@@ -93,11 +93,11 @@
<description>GET user01 resource</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>$userid1:</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -107,11 +107,11 @@
<description>GET user02 resource</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
+ <ruri>$pathprefix2:/visibletouser01/visible2.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>$userid1:</value>
</header>
- <ruri>$pathprefix2:/visibletouser01/visible2.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -121,11 +121,11 @@
<description>GET user02 resource</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
+ <ruri>$pathprefix2:/visibletouser01/hidden1.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>$userid1:</value>
</header>
- <ruri>$pathprefix2:/visibletouser01/hidden1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -139,11 +139,11 @@
<description>GET user02 resource</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
+ <ruri>$pathprefix2:/notvisibletouser01/hidden1.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>$userid1:</value>
</header>
- <ruri>$pathprefix2:/notvisibletouser01/hidden1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -160,11 +160,11 @@
<description>GET user01 resource</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>$userid3:</value>
</header>
- <ruri>1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -178,11 +178,11 @@
<description>GET user02 resource</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
+ <ruri>$pathprefix2:/visibletouser01/visible2.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>$userid3:</value>
</header>
- <ruri>$pathprefix2:/visibletouser01/visible2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -196,11 +196,11 @@
<description>GET user02 resource</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
+ <ruri>$pathprefix2:/visibletouser01/hidden1.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>$userid3:</value>
</header>
- <ruri>$pathprefix2:/visibletouser01/hidden1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -214,11 +214,11 @@
<description>GET user02 resource</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
+ <ruri>$pathprefix2:/notvisibletouser01/hidden1.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>$userid3:</value>
</header>
- <ruri>$pathprefix2:/notvisibletouser01/hidden1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -235,7 +235,7 @@
<description>Valid proxy without header</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -249,11 +249,11 @@
<description>Valid proxy proxying as another proxy</description>
<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
<method>GET</method>
+ <ruri>$pathprefix2:/visibletouser01/visible2.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>proxy2</value>
</header>
- <ruri>$pathprefix2:/visibletouser01/visible2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -267,11 +267,11 @@
<description>Regular user trying to proxy</description>
<request print-response='no'>
<method>GET</method>
+ <ruri>$pathprefix2:/visibletouser01/visible2.ics</ruri>
<header>
<name>X-Authorize-As</name>
<value>$userid2:</value>
</header>
- <ruri>$pathprefix2:/visibletouser01/visible2.ics</ruri>
<verify>
<callback>statusCode</callback>
<arg>
Modified: CalDAVTester/trunk/scripts/tests/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/put.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/put.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
<description>PUT non-recurring timed event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/1.txt</filepath>
@@ -46,7 +46,7 @@
</request>
<request>
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -88,7 +88,7 @@
<description>Plain VTODO with no date</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1todo.ics</ruri>
+ <ruri>$calendarpath1:/1todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/1.txt</filepath>
@@ -99,7 +99,7 @@
</request>
<request>
<method>GET</method>
- <ruri>1todo.ics</ruri>
+ <ruri>$calendarpath1:/1todo.ics</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -113,7 +113,7 @@
<description>Plain VTODO with DUE only</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>2todo.ics</ruri>
+ <ruri>$calendarpath1:/2todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/2.txt</filepath>
@@ -124,7 +124,7 @@
</request>
<request>
<method>GET</method>
- <ruri>2todo.ics</ruri>
+ <ruri>$calendarpath1:/2todo.ics</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -138,7 +138,7 @@
<description>Plain VTODO with DTSTART/DUARTION only</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>3todo.ics</ruri>
+ <ruri>$calendarpath1:/3todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/3.txt</filepath>
@@ -149,7 +149,7 @@
</request>
<request>
<method>GET</method>
- <ruri>3todo.ics</ruri>
+ <ruri>$calendarpath1:/3todo.ics</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -163,7 +163,7 @@
<description>Plain VTODO with DTSTART only</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>4todo.ics</ruri>
+ <ruri>$calendarpath1:/4todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/4.txt</filepath>
@@ -174,7 +174,7 @@
</request>
<request>
<method>GET</method>
- <ruri>4todo.ics</ruri>
+ <ruri>$calendarpath1:/4todo.ics</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -191,7 +191,7 @@
<description>PUT problem event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>3.ics</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/1.ics</filepath>
@@ -205,7 +205,7 @@
<description>DTSTART/DATE-TIME/UTC, DTEND/DATE</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>4.ics</ruri>
+ <ruri>$calendarpath1:/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/2.ics</filepath>
@@ -219,7 +219,7 @@
<description>DTSTART/DATE-TIME/TZID, DTEND/DATE</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>18.ics</ruri>
+ <ruri>$calendarpath1:/18.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/16.ics</filepath>
@@ -233,7 +233,7 @@
<description>DTSTART/DATE-TIME/Float, DTEND/DATE</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>19.ics</ruri>
+ <ruri>$calendarpath1:/19.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/17.ics</filepath>
@@ -247,7 +247,7 @@
<description>DTSTART/DATE-TIME/UTC, DTEND/DATE-TIME/TZID</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>5.ics</ruri>
+ <ruri>$calendarpath1:/5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/3.ics</filepath>
@@ -261,7 +261,7 @@
<description>DTSTART/DATE-TIME/UTC, DTEND/DATE-TIME/Float</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>6.ics</ruri>
+ <ruri>$calendarpath1:/6.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/4.ics</filepath>
@@ -275,7 +275,7 @@
<description>DTSTART/DATE-TIME/TZID, DTEND/DATE-TIME/UTC</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>7.ics</ruri>
+ <ruri>$calendarpath1:/7.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/5.ics</filepath>
@@ -289,7 +289,7 @@
<description>DTSTART/DATE-TIME/TZID, DTEND/DATE-TIME/Float</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>8.ics</ruri>
+ <ruri>$calendarpath1:/8.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/6.ics</filepath>
@@ -303,7 +303,7 @@
<description>DTSTART/DATE-TIME/Float, DTEND/DATE-TIME/UTC</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>9.ics</ruri>
+ <ruri>$calendarpath1:/9.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/7.ics</filepath>
@@ -317,7 +317,7 @@
<description>DTSTART/DATE-TIME/Float, DTEND/DATE-TIME/TZID</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>10.ics</ruri>
+ <ruri>$calendarpath1:/10.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/8.ics</filepath>
@@ -331,7 +331,7 @@
<description>RECURRENCE-ID component before master</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>11-23.ics</ruri>
+ <ruri>$calendarpath1:/11-23.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/23.ics</filepath>
@@ -348,7 +348,7 @@
<description>DTSTART/DATE-TIME/UTC, DUE/DATE</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>11.ics</ruri>
+ <ruri>$calendarpath1:/11.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/9.ics</filepath>
@@ -362,7 +362,7 @@
<description>DTSTART/DATE-TIME/TZID, DUE/DATE</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>20.ics</ruri>
+ <ruri>$calendarpath1:/20.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/18.ics</filepath>
@@ -376,7 +376,7 @@
<description>DTSTART/DATE-TIME/Float, DUE/DATE</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>21.ics</ruri>
+ <ruri>$calendarpath1:/21.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/19.ics</filepath>
@@ -390,7 +390,7 @@
<description>DTSTART/DATE, DUE/DATE-TIME/UTC</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>22.ics</ruri>
+ <ruri>$calendarpath1:/22.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/20.ics</filepath>
@@ -404,7 +404,7 @@
<description>DTSTART/DATE, DUE/DATE-TIME/TZID</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>23.ics</ruri>
+ <ruri>$calendarpath1:/23.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/21.ics</filepath>
@@ -418,7 +418,7 @@
<description>DTSTART/DATE, DUE/DATE-TIME/Float</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>24.ics</ruri>
+ <ruri>$calendarpath1:/24.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/22.ics</filepath>
@@ -432,7 +432,7 @@
<description>DTSTART/DATE-TIME/UTC, DUE/DATE-TIME/TZID</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>12.ics</ruri>
+ <ruri>$calendarpath1:/12.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/10.ics</filepath>
@@ -446,7 +446,7 @@
<description>DTSTART/DATE-TIME/UTC, DUE/DATE-TIME/Float</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>13.ics</ruri>
+ <ruri>$calendarpath1:/13.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/11.ics</filepath>
@@ -460,7 +460,7 @@
<description>DTSTART/DATE-TIME/TZID, DUE/DATE-TIME/UTC</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>14.ics</ruri>
+ <ruri>$calendarpath1:/14.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/12.ics</filepath>
@@ -474,7 +474,7 @@
<description>DTSTART/DATE-TIME/TZID, DUE/DATE-TIME/Float</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>15.ics</ruri>
+ <ruri>$calendarpath1:/15.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/13.ics</filepath>
@@ -488,7 +488,7 @@
<description>DTSTART/DATE-TIME/Float, DUE/DATE-TIME/UTC</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>16.ics</ruri>
+ <ruri>$calendarpath1:/16.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/14.ics</filepath>
@@ -502,7 +502,7 @@
<description>DTSTART/DATE-TIME/Float, DUE/DATE-TIME/TZID</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>17.ics</ruri>
+ <ruri>$calendarpath1:/17.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/problemics/15.ics</filepath>
@@ -519,7 +519,7 @@
<description>PUT</description>
<request>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/9.ics</filepath>
@@ -533,7 +533,7 @@
<description>GET</description>
<request>
<method>GET</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>header</callback>
<arg>
@@ -547,7 +547,7 @@
<description>PROPFIND</description>
<request>
<method>PROPFIND</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/10.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/quota.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/quota.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -28,11 +28,11 @@
<description>props on /calendars/</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendars:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$calendars:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -55,11 +55,11 @@
<description>props on /calendars/users/</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendars_users:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$userscalendars:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -82,11 +82,11 @@
<description>props on home</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -106,11 +106,11 @@
<description>props on calendar</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -130,11 +130,11 @@
<description>props on /principals/</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$principalcollection:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principalcollection:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -157,11 +157,11 @@
<description>props on /principals/users/</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$principals_users:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principals:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -184,11 +184,11 @@
<description>props on principal</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$principaluri1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principaluri1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -224,11 +224,11 @@
<description>Quota check</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -261,11 +261,11 @@
<description>Quota check</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -311,11 +311,11 @@
<description>Quota check</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
@@ -348,11 +348,11 @@
<description>Quota check</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/quota/1.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/recurrenceput.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/recurrenceput.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/recurrenceput.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
<description>PUT non-recurring timed event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/1.txt</filepath>
@@ -43,7 +43,7 @@
<description>PUT non-recurring all day event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/2.txt</filepath>
@@ -57,7 +57,7 @@
<description>PUT recurring (no exceptions) timed event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>3.ics</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/3.txt</filepath>
@@ -71,7 +71,7 @@
<description>PUT recurring (no exceptions) all day event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>4.ics</ruri>
+ <ruri>$calendarpath1:/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/4.txt</filepath>
@@ -85,7 +85,7 @@
<description>PUT recurring (with exceptions) timed event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>5.ics</ruri>
+ <ruri>$calendarpath1:/5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/5.txt</filepath>
@@ -99,7 +99,7 @@
<description>PUT recurring (with exceptions) all day event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>6.ics</ruri>
+ <ruri>$calendarpath1:/6.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/6.txt</filepath>
@@ -113,7 +113,7 @@
<description>PUT recurring (with future exceptions) timed event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>7.ics</ruri>
+ <ruri>$calendarpath1:/7.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/7.txt</filepath>
@@ -127,7 +127,7 @@
<description>PUT recurring (with future exceptions) all day event</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>8.ics</ruri>
+ <ruri>$calendarpath1:/8.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/8.txt</filepath>
@@ -144,7 +144,7 @@
<description>Plain VTODO with no date - recurring</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1todo.ics</ruri>
+ <ruri>$calendarpath1:/1todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/5.txt</filepath>
@@ -158,7 +158,7 @@
<description>Plain VTODO with all-day DUE only - recurring</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>2todo.ics</ruri>
+ <ruri>$calendarpath1:/2todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/6.txt</filepath>
@@ -172,7 +172,7 @@
<description>Plain VTODO with all-day DTSTART/DURATION only - recurring</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>3todo.ics</ruri>
+ <ruri>$calendarpath1:/3todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/7.txt</filepath>
@@ -186,7 +186,7 @@
<description>Plain VTODO with all-day DTSTART only - recurring</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>3todo.ics</ruri>
+ <ruri>$calendarpath1:/3todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/8.txt</filepath>
@@ -200,7 +200,7 @@
<description>Plain VTODO with timed DUE only - recurring</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>4todo.ics</ruri>
+ <ruri>$calendarpath1:/4todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/9.txt</filepath>
@@ -214,7 +214,7 @@
<description>Plain VTODO with timed DTSTART/DURATION only - recurring</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>5todo.ics</ruri>
+ <ruri>$calendarpath1:/5todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/10.txt</filepath>
@@ -228,7 +228,7 @@
<description>Plain VTODO with timed DTSTART/DURATION only - recurring</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>5todo.ics</ruri>
+ <ruri>$calendarpath1:/5todo.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/todo/11.txt</filepath>
Modified: CalDAVTester/trunk/scripts/tests/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/reports.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/reports.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
<start>
<request end-delete="yes">
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/1.txt</filepath>
@@ -30,7 +30,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/2.txt</filepath>
@@ -38,7 +38,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>3.ics</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/3.txt</filepath>
@@ -46,7 +46,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>4.ics</ruri>
+ <ruri>$calendarpath1:/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/4.txt</filepath>
@@ -54,7 +54,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>5.ics</ruri>
+ <ruri>$calendarpath1:/5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/5.txt</filepath>
@@ -62,7 +62,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>6.ics</ruri>
+ <ruri>$calendarpath1:/6.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/6.txt</filepath>
@@ -70,7 +70,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>7.ics</ruri>
+ <ruri>$calendarpath1:/7.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/7.txt</filepath>
@@ -78,7 +78,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>8.ics</ruri>
+ <ruri>$calendarpath1:/8.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/8.txt</filepath>
@@ -86,7 +86,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>9.ics</ruri>
+ <ruri>$calendarpath1:/9.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/9.txt</filepath>
@@ -94,7 +94,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>10.ics</ruri>
+ <ruri>$calendarpath1:/10.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/10.txt</filepath>
@@ -102,7 +102,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>11.ics</ruri>
+ <ruri>$calendarpath1:/11.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/11.txt</filepath>
@@ -110,7 +110,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>12.ics</ruri>
+ <ruri>$calendarpath1:/12.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/12.txt</filepath>
@@ -118,7 +118,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>13.ics</ruri>
+ <ruri>$calendarpath1:/13.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/13.txt</filepath>
@@ -126,7 +126,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>14.ics</ruri>
+ <ruri>$calendarpath1:/14.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/14.txt</filepath>
@@ -134,7 +134,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>15.ics</ruri>
+ <ruri>$calendarpath1:/15.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/15.txt</filepath>
@@ -142,7 +142,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>18.ics</ruri>
+ <ruri>$calendarpath1:/18.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/18.txt</filepath>
@@ -150,7 +150,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>19.ics</ruri>
+ <ruri>$calendarpath1:/19.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/19.txt</filepath>
@@ -158,7 +158,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>101.ics</ruri>
+ <ruri>$calendarpath1:/101.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/101.txt</filepath>
@@ -166,7 +166,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>102.ics</ruri>
+ <ruri>$calendarpath1:/102.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/102.txt</filepath>
@@ -174,7 +174,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>103.ics</ruri>
+ <ruri>$calendarpath1:/103.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/103.txt</filepath>
@@ -182,7 +182,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>104.ics</ruri>
+ <ruri>$calendarpath1:/104.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/104.txt</filepath>
@@ -190,7 +190,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>105.ics</ruri>
+ <ruri>$calendarpath1:/105.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/105.txt</filepath>
@@ -198,7 +198,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>106.ics</ruri>
+ <ruri>$calendarpath1:/106.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/reports/put/106.txt</filepath>
@@ -211,6 +211,7 @@
<description>basic multiget of 4 resources returning etag and entire ics data</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/multiget/1.txt</filepath>
@@ -233,6 +234,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>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/multiget/2.txt</filepath>
@@ -253,6 +255,7 @@
<description>basic multiget of 4 resources returning etag and only VTIMEZONE components</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/multiget/3.txt</filepath>
@@ -273,6 +276,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>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/multiget/4.txt</filepath>
@@ -295,6 +299,7 @@
<description>as 4.txt except that the SUMMARY property value is not returned</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/multiget/5.txt</filepath>
@@ -317,6 +322,7 @@
<description>Does allprop</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/multiget/6.txt</filepath>
@@ -337,6 +343,7 @@
<description>Does propname</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/multiget/7.txt</filepath>
@@ -357,6 +364,7 @@
<description>Single non-existent query</description>
<request print-response="no">
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/multiget/8.xml</filepath>
@@ -377,6 +385,7 @@
<description>query for resources with VCALENDAR & VEVENT defined</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/1.txt</filepath>
@@ -409,6 +418,7 @@
<description>query for resources with VCALENDAR & VEVENT not defined</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/8.txt</filepath>
@@ -432,6 +442,7 @@
<description>query for resources where the SUMMARY in a VEVENT contains the character '1'</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/2.txt</filepath>
@@ -455,6 +466,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/7.txt</filepath>
@@ -480,6 +492,7 @@
<description>query for resources where the DESCRIPTION property exists in a VEVENT</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/3.txt</filepath>
@@ -499,6 +512,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/9.txt</filepath>
@@ -530,6 +544,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/4.txt</filepath>
@@ -547,6 +562,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/10.txt</filepath>
@@ -577,6 +593,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/5.txt</filepath>
@@ -595,6 +612,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/6.txt</filepath>
@@ -625,6 +643,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/11.txt</filepath>
@@ -642,6 +661,7 @@
<description>query for resources with VCALENDAR & VTODO defined</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/101.txt</filepath>
@@ -664,6 +684,7 @@
<description>query for resources where the SUMMARY in a VTODO contains the character '1'</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/102.txt</filepath>
@@ -681,6 +702,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/103.txt</filepath>
@@ -700,6 +722,7 @@
<description>query for resources with VCALENDAR & VEVENT or VTODO defined</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/201.txt</filepath>
@@ -738,6 +761,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/202.txt</filepath>
@@ -762,6 +786,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>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/203.txt</filepath>
@@ -782,6 +807,7 @@
<description>query for VEVENTs that do not contain VALARMs</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/12.txt</filepath>
@@ -812,6 +838,7 @@
<description>query for VEVENTs that contain a CATEGORY and filter by CATEGORY</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/13.txt</filepath>
@@ -833,6 +860,7 @@
<description>query for VEVENTs that contain a CATEGORY but test with uppercase string</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/14.txt</filepath>
@@ -854,6 +882,7 @@
<description>empty query</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/basicquery/15.xml</filepath>
@@ -870,6 +899,7 @@
<description>query for resources with VCALENDAR & VEVENT defined - return filtered data</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/filtereddata/1.xml</filepath>
@@ -894,6 +924,7 @@
<description>query for resources with VCALENDAR & VEVENT defined - return filtered data</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/filtereddata/2.xml</filepath>
@@ -921,6 +952,7 @@
<description>query for VEVENTs within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/1.txt</filepath>
@@ -941,6 +973,7 @@
<description>query for VEVENT/VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/2.txt</filepath>
@@ -969,6 +1002,7 @@
<description>query for VEVENTs within time range with specific SUMMARY text</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/3.txt</filepath>
@@ -986,6 +1020,7 @@
<description>query for VEVENT recurrence instance within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/4.txt</filepath>
@@ -1003,6 +1038,7 @@
<description>query for overridden VEVENT instance within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/5.txt</filepath>
@@ -1020,6 +1056,7 @@
<description>query for overridden VEVENT not within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/6.txt</filepath>
@@ -1033,6 +1070,7 @@
<description>query for overridden this-and-future VEVENT within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/7.txt</filepath>
@@ -1050,6 +1088,7 @@
<description>query for VTODOs within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/101.txt</filepath>
@@ -1068,6 +1107,7 @@
<description>query for VTODOs within time range with specific SUMMARY text</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/102.txt</filepath>
@@ -1085,6 +1125,7 @@
<description>query for VTODO recurrence instance within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/103.txt</filepath>
@@ -1103,6 +1144,7 @@
<description>Invalid VTIMEZONE check</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/104.xml</filepath>
@@ -1120,6 +1162,7 @@
<description>query for VEVENTs within time range in distant future</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/timerangequery/8.txt</filepath>
@@ -1140,6 +1183,7 @@
<description>query for VALARMS within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/alarmtimerangequery/1.txt</filepath>
@@ -1157,6 +1201,7 @@
<description>query for repeating VALARMS within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/alarmtimerangequery/2.txt</filepath>
@@ -1174,6 +1219,7 @@
<description>query for recurring VALARMS within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/alarmtimerangequery/3.txt</filepath>
@@ -1192,6 +1238,7 @@
<description>query for recurring/overridden VALARMS within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/alarmtimerangequery/4.txt</filepath>
@@ -1210,6 +1257,7 @@
<description>query for VALARMS on VTODO within time range</description>
<request>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/alarmtimerangequery/5.txt</filepath>
@@ -1230,6 +1278,7 @@
<description>query for free busy with time range</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/freebusy/1.txt</filepath>
@@ -1265,6 +1314,7 @@
<description>query for free busy with overlapping and consecutive events</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/freebusy/2.txt</filepath>
@@ -1297,6 +1347,7 @@
<description>time-range query with limit over same range</description>
<request print-response='yes'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/limitexpand/1.txt</filepath>
@@ -1316,6 +1367,7 @@
<description>time-range query with limit over different range</description>
<request print-response='yes'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/limitexpand/2.txt</filepath>
@@ -1335,6 +1387,7 @@
<description>time-range query with expand over same range</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/limitexpand/3.txt</filepath>
@@ -1355,6 +1408,7 @@
<description>time-range query with expand over different range</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/limitexpand/4.txt</filepath>
@@ -1375,6 +1429,7 @@
<description>query with limit-freebusy-set</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/limitexpand/5.txt</filepath>
@@ -1392,6 +1447,7 @@
<description>query with expand all-day - no timezone</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/limitexpand/6.xml</filepath>
@@ -1405,6 +1461,7 @@
<description>query with expand all-day - timezone</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/reports/limitexpand/7.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -91,11 +91,11 @@
<description>Make sure no resource exists</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$outbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/2.xml</filepath>
@@ -113,11 +113,11 @@
<description>Make sure no resource exists</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/3.xml</filepath>
@@ -135,11 +135,11 @@
<description>Make sure no resource exists</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/3.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/schedulenomore.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulenomore.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/schedulenomore.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
<description>SCHEDULE on valid outbox</description>
<request>
<method>SCHEDULE</method>
+ <ruri>$pathprefix1:/outbox/</ruri>
<header>
<name>Organizer</name>
<value>$cuaddr1:</value>
@@ -36,7 +37,6 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix1:/outbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
Modified: CalDAVTester/trunk/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepost.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/schedulepost.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
<start>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -32,7 +32,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -40,7 +40,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -48,7 +48,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix2:/calendar/1.ics</ruri>
+ <ruri>$calendarpath2:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/7.ics</filepath>
@@ -56,7 +56,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix2:/calendar/2.ics</ruri>
+ <ruri>$calendarpath2:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/8.ics</filepath>
@@ -64,7 +64,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix2:/calendar/3.ics</ruri>
+ <ruri>$calendarpath2:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/10.ics</filepath>
@@ -72,7 +72,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix3:/calendar/1.ics</ruri>
+ <ruri>$calendarpath3:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/9.ics</filepath>
@@ -80,7 +80,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix3:/calendar/2.ics</ruri>
+ <ruri>$calendarpath3:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/10.ics</filepath>
@@ -335,11 +335,11 @@
<description>Make sure no resource exists</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$outbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/11.xml</filepath>
@@ -361,11 +361,11 @@
<description>Make sure resource exists and properties are set</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/12.xml</filepath>
@@ -388,11 +388,11 @@
<description>Make sure resource exists and properties are set</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/12.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostacl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostacl.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/schedulepostacl.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</start>
@@ -125,7 +125,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -242,7 +242,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -363,7 +363,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -434,11 +434,11 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$outbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -492,7 +492,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -613,7 +613,7 @@
<description>Two items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -734,7 +734,7 @@
<description>Two items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -855,7 +855,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -972,7 +972,7 @@
<description>Three items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1093,7 +1093,7 @@
<description>Three items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1146,11 +1146,11 @@
<description>getctag on resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rcalendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -1165,11 +1165,11 @@
<description>getctag on resource01 inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -1252,7 +1252,7 @@
<description>Two items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1302,11 +1302,11 @@
<description>Test getctag on resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rcalendarpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -1324,11 +1324,11 @@
<description>getctag on resource01 inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -1371,7 +1371,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</start>
@@ -81,7 +81,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -144,7 +144,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -207,7 +207,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -270,7 +270,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -333,7 +333,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -396,7 +396,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -459,7 +459,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -522,7 +522,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -585,7 +585,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -648,7 +648,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -711,7 +711,7 @@
<description>Two items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -756,7 +756,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</start>
@@ -81,7 +81,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -144,7 +144,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -207,7 +207,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -270,7 +270,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -333,7 +333,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -396,7 +396,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -459,7 +459,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -553,7 +553,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</start>
@@ -81,7 +81,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -141,7 +141,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -201,7 +201,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -246,7 +246,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
<start>
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix2:/calendar/1.ics</ruri>
+ <ruri>$calendarpath2:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulemaskuid/1.ics</filepath>
@@ -32,7 +32,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix2:/calendar/2.ics</ruri>
+ <ruri>$calendarpath2:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulemaskuid/2.ics</filepath>
@@ -205,7 +205,7 @@
<end>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/calendar/</ruri>
+ <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -213,7 +213,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/calendar/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -221,7 +221,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/calendar/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -67,11 +67,11 @@
<description>Make sure no resource exists</description>
<request print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$outbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix1:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/2.xml</filepath>
@@ -93,11 +93,11 @@
<description>Make sure resource exists and properties are set</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/3.xml</filepath>
@@ -115,11 +115,11 @@
<description>Make sure resource exists and properties are set</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/3.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/scheduleprops.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/scheduleprops.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/scheduleprops.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@
<description>PROPFIND inbox/outbox URLs</description>
<request>
<method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/1.xml</filepath>
@@ -55,11 +55,11 @@
<description>PROPFIND inbox</description>
<request print-response="no">
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/$inbox:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/2.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/calendar/1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/servertoserver/1.ics</filepath>
@@ -48,7 +48,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix2:/calendar/1.ics</ruri>
+ <ruri>$calendarpath2:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/servertoserver/2.ics</filepath>
Modified: CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: CalDAVTester/trunk/scripts/tests/timezones.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/timezones.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/timezones.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
<description>PUT event with truncated timezone in April</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/timezones/1.ics</filepath>
@@ -42,6 +42,7 @@
<description>query for free busy with time range</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/timezones/2.xml</filepath>
@@ -59,7 +60,7 @@
<description>PUT event with truncated timezone in December</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>3.ics</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/timezones/3.ics</filepath>
@@ -73,6 +74,7 @@
<description>query for free busy with time range</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/timezones/2.xml</filepath>
@@ -94,7 +96,7 @@
<description>PUT event with truncated timezone in April</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>4.ics</ruri>
+ <ruri>$calendarpath1:/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/timezones/4.ics</filepath>
@@ -108,6 +110,7 @@
<description>query for free busy with time range</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/timezones/2.xml</filepath>
@@ -127,7 +130,7 @@
<description>PUT event with truncated timezone in December</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>5.ics</ruri>
+ <ruri>$calendarpath1:/5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/timezones/5.ics</filepath>
@@ -141,6 +144,7 @@
<description>query for free busy with time range</description>
<request print-response='no'>
<method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/timezones/2.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/timezoneservice.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/timezoneservice.xml 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/scripts/tests/timezoneservice.xml 2008-12-12 20:39:41 UTC (rev 3521)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2008 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
<description>GET on resource</description>
<request>
<method>GET</method>
- <ruri>/timezones</ruri>
+ <ruri>$timezoneservice:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -38,7 +38,7 @@
<description>POST on resource</description>
<request>
<method>POST</method>
- <ruri>/timezones</ruri>
+ <ruri>$timezoneservice:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -48,7 +48,7 @@
<description>PUT on resource - fails</description>
<request>
<method>PUT</method>
- <ruri>/timezones</ruri>
+ <ruri>$timezoneservice:</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/recurrenceput/1.txt</filepath>
@@ -66,7 +66,7 @@
<description>DELETE on resource - fails</description>
<request>
<method>DELETE</method>
- <ruri>/timezones</ruri>
+ <ruri>$timezoneservice:</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -83,7 +83,7 @@
<description>GET on resource - invalid parameter</description>
<request>
<method>GET</method>
- <ruri>/timezones?query=true</ruri>
+ <ruri>$timezoneservice:?query=true</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -101,7 +101,7 @@
<description>POST on resource - invalid parameter</description>
<request>
<method>POST</method>
- <ruri>/timezones?query=true</ruri>
+ <ruri>$timezoneservice:?query=true</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -119,7 +119,7 @@
<description>GET on resource - invalid method</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=true</ruri>
+ <ruri>$timezoneservice:?method=true</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -137,7 +137,7 @@
<description>POST on resource - invalid method</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=true</ruri>
+ <ruri>$timezoneservice:?method=true</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -155,7 +155,7 @@
<description>GET on resource - multiple methods</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=list&method=list</ruri>
+ <ruri>$timezoneservice:?method=list&method=list</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -173,7 +173,7 @@
<description>POST on resource - multiple methods</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=list&method=list</ruri>
+ <ruri>$timezoneservice:?method=list&method=list</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -194,7 +194,7 @@
<description>GET on resource</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=list</ruri>
+ <ruri>$timezoneservice:?method=list</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -213,7 +213,7 @@
<description>POST on resource</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=list</ruri>
+ <ruri>$timezoneservice:?method=list</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -235,7 +235,7 @@
<description>GET on resource - no tzid</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=get</ruri>
+ <ruri>$timezoneservice:?method=get</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -253,7 +253,7 @@
<description>POST on resource - no tzid</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=get</ruri>
+ <ruri>$timezoneservice:?method=get</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -271,7 +271,7 @@
<description>GET on resource - multiple tzid</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=get&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -289,7 +289,7 @@
<description>POST on resource - multiple tzid</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=get&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -307,7 +307,7 @@
<description>GET on resource - invalid tzid</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=get&tzid=America/Pittsburgh</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=America/Pittsburgh</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -325,7 +325,7 @@
<description>POST on resource - invalid tzid</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=get&tzid=America/Pittsburgh</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=America/Pittsburgh</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -346,7 +346,7 @@
<description>GET on resource</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=get&tzid=America/New_York</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=America/New_York</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -363,7 +363,7 @@
<description>POST on resource</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=get&tzid=America/New_York</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=America/New_York</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -380,7 +380,7 @@
<description>GET on resource</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=get&tzid=Europe/London</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=Europe/London</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -397,7 +397,7 @@
<description>POST on resource</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=get&tzid=Europe/London</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=Europe/London</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -414,7 +414,7 @@
<description>GET on resource</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=get&tzid=GB</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=GB</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -431,7 +431,7 @@
<description>POST on resource</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=get&tzid=GB</ruri>
+ <ruri>$timezoneservice:?method=get&tzid=GB</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -451,7 +451,7 @@
<description>GET on resource - no tzid</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand</ruri>
+ <ruri>$timezoneservice:?method=expand</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -469,7 +469,7 @@
<description>POST on resource - no tzid</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand</ruri>
+ <ruri>$timezoneservice:?method=expand</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -487,7 +487,7 @@
<description>GET on resource - multiple tzid</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -505,7 +505,7 @@
<description>POST on resource - multiple tzid</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&tzid=America/Los_Angeles</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -523,7 +523,7 @@
<description>GET on resource - invalid tzid</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/Pittsburgh</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/Pittsburgh</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -541,7 +541,7 @@
<description>POST on resource - invalid tzid</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/Pittsburgh</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/Pittsburgh</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -559,7 +559,7 @@
<description>GET on resource - no start</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -577,7 +577,7 @@
<description>POST on resource - no start</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -595,7 +595,7 @@
<description>GET on resource - too many start</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&start=20090101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&start=20090101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -613,7 +613,7 @@
<description>POST on resource - too many start</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&start=20090101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&start=20090101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -631,7 +631,7 @@
<description>GET on resource - invalid start</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=2007</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=2007</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -649,7 +649,7 @@
<description>POST on resource - invalid start</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=2007</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=2007</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -667,7 +667,7 @@
<description>GET on resource - no end</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -685,7 +685,7 @@
<description>POST on resource - no end</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -703,7 +703,7 @@
<description>GET on resource - too many end</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20090101&end=20090101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&end=20090101&end=20090101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -721,7 +721,7 @@
<description>POST on resource - too many end</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20090101&end=20090101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&end=20090101&end=20090101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -739,7 +739,7 @@
<description>GET on resource - invalid end</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=2009</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&end=2009</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -757,7 +757,7 @@
<description>POST on resource - invalid end</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=2009</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&end=2009</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -775,7 +775,7 @@
<description>GET on resource - start > end</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20090101&end=20080101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20090101&end=20080101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -793,7 +793,7 @@
<description>POST on resource - start > end</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20090101&end=20080101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20090101&end=20080101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -811,7 +811,7 @@
<description>GET on resource - start == end</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20080101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&end=20080101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -829,7 +829,7 @@
<description>POST on resource - start == end</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20080101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&end=20080101</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
@@ -850,7 +850,7 @@
<description>GET on resource - simple range</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20090101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&end=20090101</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -872,7 +872,7 @@
<description>POST on resource - simple range</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20080101&end=20090101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20080101&end=20090101</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -894,7 +894,7 @@
<description>GET on resource - complex range</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20060101&end=20080101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20060101&end=20080101</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -920,7 +920,7 @@
<description>POST on resource - complex range</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/New_York&start=20060101&end=20080101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/New_York&start=20060101&end=20080101</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -946,7 +946,7 @@
<description>GET on resource - no DST</description>
<request>
<method>GET</method>
- <ruri>/timezones?method=expand&tzid=America/Phoenix&start=20060101&end=20090101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/Phoenix&start=20060101&end=20090101</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -969,7 +969,7 @@
<description>POST on resource - start == end</description>
<request>
<method>POST</method>
- <ruri>/timezones?method=expand&tzid=America/Phoenix&start=20060101&end=20090101</ruri>
+ <ruri>$timezoneservice:?method=expand&tzid=America/Phoenix&start=20060101&end=20090101</ruri>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/src/request.py 2008-12-12 20:39:41 UTC (rev 3521)
@@ -1,5 +1,5 @@
##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2008 Apple Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -150,14 +150,7 @@
return "Method: %s; uris: %s" % (self.method, self.ruris if len(self.ruris) > 1 else self.ruri,)
def getURI( self, si ):
- if self.ruri == "$":
- return self.ruri
- if len(self.ruri) > 0 and self.ruri[0] == '/':
- uri = ""
- else:
- uri = "%s/" % ( si.calendarpath )
- uri += self.ruri
- return uri
+ return self.ruri
def getHeaders( self, si ):
hdrs = self.headers
Modified: CalDAVTester/trunk/src/serverinfo.py
===================================================================
--- CalDAVTester/trunk/src/serverinfo.py 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/src/serverinfo.py 2008-12-12 20:39:41 UTC (rev 3521)
@@ -1,5 +1,5 @@
##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2008 Apple Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
self.port = 80
self.authtype = "basic"
self.ssl = False
- self.calendarpath = ""
self.user = ""
self.pswd = ""
self.serverfilepath = ""
@@ -42,8 +41,16 @@
def subs(self, str, db=None):
if db is None:
db = self.subsdict
- for key, value in db.iteritems():
- str = str.replace(key, value)
+ count = 0
+ while count < 10:
+ do_again = False
+ for key, value in db.iteritems():
+ newstr = str.replace(key, value)
+ do_again = do_again or (newstr != str)
+ str = newstr
+ if not do_again:
+ break
+ count += 1
return str
def addsubs(self, items, db=None):
@@ -86,9 +93,6 @@
def updateParams(self):
# Now cache some useful substitutions
- if "$calendarpath1:" not in self.subsdict:
- raise ValueError, "Must have $calendarpath1: substitution"
- self.calendarpath = self.subsdict["$calendarpath1:"]
if "$userid1:" not in self.subsdict:
raise ValueError, "Must have $userid1: substitution"
self.user = self.subsdict["$userid1:"]
@@ -99,6 +103,10 @@
def parseSubstitutionsXML(self, node):
for child in node._get_childNodes():
if child._get_localName() == src.xmlDefs.ELEMENT_SUBSTITUTION:
+
+ # Look for repeats
+ repeat = child.getAttribute( src.xmlDefs.ATTR_REPEAT )
+
key = None
value = None
for schild in child._get_childNodes():
@@ -106,5 +114,10 @@
key = schild.firstChild.data.encode("utf-8")
elif schild._get_localName() == src.xmlDefs.ELEMENT_VALUE:
value = schild.firstChild.data.encode("utf-8")
+
if key and value:
- self.subsdict[key] = value
+ if repeat:
+ for count in range(1, int(repeat)):
+ self.subsdict[key % (count,)] = value % (count,)
+ else:
+ self.subsdict[key] = value
Modified: CalDAVTester/trunk/src/xmlDefs.py
===================================================================
--- CalDAVTester/trunk/src/xmlDefs.py 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/src/xmlDefs.py 2008-12-12 20:39:41 UTC (rev 3521)
@@ -1,5 +1,5 @@
##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2008 Apple Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -82,6 +82,7 @@
ATTR_NAME = "name"
ATTR_PRINT_RESPONSE = "print-response"
ATTR_PSWD = "pswd"
+ATTR_REPEAT = "repeat"
ATTR_REQUEST_FAILED = "request-failed"
ATTR_STATS = "stats"
ATTR_SUBSTITUTIONS = "substitutions"
Modified: CalDAVTester/trunk/verifiers/dataString.py
===================================================================
--- CalDAVTester/trunk/verifiers/dataString.py 2008-12-12 19:42:42 UTC (rev 3520)
+++ CalDAVTester/trunk/verifiers/dataString.py 2008-12-12 20:39:41 UTC (rev 3521)
@@ -1,5 +1,5 @@
##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2008 Apple Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -37,9 +37,11 @@
newrespdata = respdata
# Check each contains and not-contains (AND operation)
for item in contains:
+ item = manager.server_info.subs(item)
if newrespdata.find(item.replace("\n", "\r\n")) == -1:
return False, " Response data does not contain \"%s\"" % (item,)
for item in notcontains:
+ item = manager.server_info.subs(item)
if newrespdata.find(item.replace("\n", "\r\n")) != -1:
return False, " Response data incorrectly contains \"%s\"" % (item,)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081212/bb237a59/attachment-0001.html>
More information about the calendarserver-changes
mailing list