[CalendarServer-changes] [3526] CalDAVTester/trunk/scripts
source_changes at macosforge.org
source_changes at macosforge.org
Mon Dec 15 09:13:33 PST 2008
Revision: 3526
http://trac.macosforge.org/projects/calendarserver/changeset/3526
Author: cdaboo at apple.com
Date: 2008-12-15 09:13:33 -0800 (Mon, 15 Dec 2008)
Log Message:
-----------
More tweaks to substitutions.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/acl.xml
CalDAVTester/trunk/scripts/tests/availability.xml
CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
CalDAVTester/trunk/scripts/tests/ctag.xml
CalDAVTester/trunk/scripts/tests/dropbox.xml
CalDAVTester/trunk/scripts/tests/errors.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/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/nonascii.xml
CalDAVTester/trunk/scripts/tests/privatecomments.xml
CalDAVTester/trunk/scripts/tests/privateevents.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
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -206,7 +206,7 @@
<key>$pswd%d:</key>
<value>user%02d</value>
</substitution>
- <!-- relative path to first user principal resource-->
+ <!-- relative path to user principal resource-->
<substitution repeat="10">
<key>$principal%d:</key>
<value>$principals_users:$userid%d:/</value>
@@ -219,22 +219,42 @@
<key>$principal%dnoslash:</key>
<value>$principals_users:$userid%d:</value>
</substitution>
- <!-- relative path to first user calendar home-->
+ <!-- relative path to user calendar home-->
<substitution repeat="10">
<key>$pathprefix%d:</key>
<value>$calendars_uids:$userguid%d:</value>
</substitution>
- <!-- relative path to first user calendar-->
+ <!-- relative path to user calendar-->
<substitution repeat="10">
<key>$calendarpath%d:</key>
<value>$calendars_uids:$userguid%d:/$calendar:</value>
</substitution>
- <!-- relative path to first user calendar home-->
+ <!-- relative path to user inbox-->
<substitution repeat="10">
+ <key>$inboxpath%d:</key>
+ <value>$calendars_uids:$userguid%d:/$inbox:</value>
+ </substitution>
+ <!-- relative path to user outbox-->
+ <substitution repeat="10">
+ <key>$outboxpath%d:</key>
+ <value>$calendars_uids:$userguid%d:/$outbox:</value>
+ </substitution>
+ <!-- relative path to user dropbox-->
+ <substitution repeat="10">
+ <key>$dropboxpath%d:</key>
+ <value>$calendars_uids:$userguid%d:/$dropbox:</value>
+ </substitution>
+ <!-- relative path to user freebusy-->
+ <substitution repeat="10">
+ <key>$freebusypath%d:</key>
+ <value>$calendars_uids:$userguid%d:/$freebusy:</value>
+ </substitution>
+ <!-- relative path to user alternate calendar home-->
+ <substitution repeat="10">
<key>$calendarpathalt%d:</key>
- <value>$calendars_uids:$userid%d:/$calendar:</value>
+ <value>$calendars_users:$userid%d:/$calendar:</value>
</substitution>
- <!-- calendar user address of first user-->
+ <!-- calendar user address of user-->
<substitution repeat="10">
<key>$cuaddr%d:</key>
<value>mailto:$userid%d:@example.com</value>
@@ -276,6 +296,16 @@
<key>$rcalendarpath1:</key>
<value>$calendars_uids:$resourceguid1:/$calendar:</value>
</substitution>
+ <!-- relative path to first resource inbox-->
+ <substitution>
+ <key>$rinboxpath1:</key>
+ <value>$calendars_uids:$resourceguid1:/$inbox:</value>
+ </substitution>
+ <!-- relative path to first resource outbox-->
+ <substitution>
+ <key>$routboxpath1:</key>
+ <value>$calendars_uids:$resourceguid1:/$outbox:</value>
+ </substitution>
<!-- relative path to first resource principal resource-->
<substitution>
<key>$rprincipal1:</key>
Modified: CalDAVTester/trunk/scripts/tests/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/acl.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/acl.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -235,7 +235,7 @@
<description>Check for schedule privilege on iTIP Inbox</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/inbox/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -261,7 +261,7 @@
<description>Check for schedule privilege on iTIP Outbox</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/outbox/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -339,7 +339,7 @@
<value/>
<value>visibletouser01/</value>
<value>writeabletouser01/</value>
- <value>freebusy</value>
+ <value>$freebusy:</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/availability.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/availability.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -403,7 +403,7 @@
<description>PROPFIND no availability</description>
<request>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/inbox/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/availability/15.xml</filepath>
@@ -421,7 +421,7 @@
<description>PROPPATCH invalid availability</description>
<request>
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/inbox/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/availability/16.xml</filepath>
@@ -439,7 +439,7 @@
<description>PROPPATCH valid availability</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/inbox/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/availability/17.xml</filepath>
@@ -460,7 +460,7 @@
<description>query for free busy with time range</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/outbox/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/availability/19.ics</filepath>
@@ -481,7 +481,7 @@
<end>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/inbox/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/availability/18.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -263,7 +263,7 @@
<description>Verify no access for scheduling</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/9.ics</filepath>
@@ -475,7 +475,7 @@
<description>Verify access for scheduling</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/9.ics</filepath>
@@ -489,7 +489,7 @@
<description>Verify no access for scheduling</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/13.ics</filepath>
Modified: CalDAVTester/trunk/scripts/tests/ctag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/ctag.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/ctag.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -460,7 +460,7 @@
<description>Check for CTag on inbox</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -522,7 +522,7 @@
<description>Test inbox ctag change</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -557,11 +557,11 @@
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/dropbox.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/dropbox.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -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:">$dropboxpath1:/</href></value>
</arg>
</verify>
</request>
@@ -52,7 +52,7 @@
<description>Look for properties</description>
<request>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$dropbox:/</ruri>
+ <ruri>$dropboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -76,7 +76,7 @@
<description>Create drop box</description>
<request end-delete='yes'>
<method>MKCOL</method>
- <ruri>$pathprefix1:/$dropbox:/ABCEFG/</ruri>
+ <ruri>$dropboxpath1:/ABCEFG/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -90,7 +90,7 @@
<description>Look for properties</description>
<request>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$dropbox:/ABCEFG/</ruri>
+ <ruri>$dropboxpath1:/ABCEFG/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -114,7 +114,7 @@
<description>Create drop box resource</description>
<request>
<method>PUT</method>
- <ruri>$pathprefix1:/$dropbox:/ABCEFG/test.xml</ruri>
+ <ruri>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/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>$dropboxpath1:/ABCEFG/calendar/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
Modified: CalDAVTester/trunk/scripts/tests/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/errors.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/errors.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -1263,7 +1263,7 @@
<description>POST free busy</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/errors/35.ics</filepath>
Modified: CalDAVTester/trunk/scripts/tests/implicitacls.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitacls.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitacls.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -28,7 +28,7 @@
<description>Look for CALDAV:schedule-send on Outbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/outbox/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -51,7 +51,7 @@
<description>Look for CALDAV:schedule-send on Outbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/inbox/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -77,7 +77,7 @@
<description>Look for CALDAV:schedule-send on Outbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/outbox/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -100,7 +100,7 @@
<description>Look for CALDAV:schedule-send on Outbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/inbox/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
Modified: CalDAVTester/trunk/scripts/tests/implicitauto1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto1.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitauto1.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -32,15 +32,15 @@
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -71,7 +71,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -103,7 +103,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -139,7 +139,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -171,15 +171,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -214,7 +214,7 @@
<description>Two items in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -246,7 +246,7 @@
<description>No items in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -282,7 +282,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -314,15 +314,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -350,7 +350,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -382,7 +382,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -418,7 +418,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -450,15 +450,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -486,7 +486,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -518,7 +518,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -554,7 +554,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -586,15 +586,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -622,7 +622,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -654,7 +654,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -690,7 +690,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -722,15 +722,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -758,7 +758,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -790,7 +790,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -826,7 +826,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -858,15 +858,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -894,7 +894,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -926,7 +926,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -962,7 +962,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -994,15 +994,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -1031,7 +1031,7 @@
<description>getctag on resource01 inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1108,7 +1108,7 @@
<description>No items in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -1140,7 +1140,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1184,7 +1184,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto1/1.xml</filepath>
@@ -1246,7 +1246,7 @@
<description>getctag on resource01 inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1268,15 +1268,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -1284,7 +1284,7 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
@@ -1292,7 +1292,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -1300,7 +1300,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitauto2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto2.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitauto2.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,11 +24,11 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -59,7 +59,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -91,7 +91,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -123,15 +123,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -159,7 +159,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -191,7 +191,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -223,15 +223,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -259,7 +259,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -291,7 +291,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -323,15 +323,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -359,7 +359,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -391,7 +391,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -423,15 +423,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -459,7 +459,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -491,7 +491,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -523,15 +523,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -559,7 +559,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -591,7 +591,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -623,15 +623,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -659,7 +659,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -691,7 +691,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -723,15 +723,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -759,7 +759,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -791,7 +791,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto2/1.xml</filepath>
@@ -823,15 +823,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -839,7 +839,7 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
@@ -847,7 +847,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -855,7 +855,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitauto3.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto3.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitauto3.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,11 +24,11 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -59,7 +59,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -91,7 +91,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -123,15 +123,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -159,7 +159,7 @@
<description>No items in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -191,7 +191,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -223,15 +223,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -259,7 +259,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -291,7 +291,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -323,15 +323,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -359,7 +359,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -391,7 +391,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -423,15 +423,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -459,7 +459,7 @@
<description>No items in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -491,7 +491,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -523,15 +523,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -559,7 +559,7 @@
<description>No items in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -591,7 +591,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -623,15 +623,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -659,7 +659,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -691,7 +691,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -723,15 +723,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -759,7 +759,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -791,7 +791,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto3/1.xml</filepath>
@@ -823,15 +823,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -839,7 +839,7 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
@@ -847,7 +847,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -855,7 +855,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitauto4.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto4.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitauto4.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,11 +24,11 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -59,7 +59,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto4/1.xml</filepath>
@@ -91,7 +91,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto4/1.xml</filepath>
@@ -123,15 +123,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -159,7 +159,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto4/1.xml</filepath>
@@ -191,7 +191,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto4/1.xml</filepath>
@@ -223,15 +223,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -259,7 +259,7 @@
<description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto4/1.xml</filepath>
@@ -291,7 +291,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/auto4/1.xml</filepath>
@@ -323,15 +323,15 @@
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
</test>
</test-suite>
@@ -339,7 +339,7 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
@@ -347,7 +347,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -355,7 +355,7 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitcalendartransp.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitcalendartransp.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitcalendartransp.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -160,7 +160,7 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -222,7 +222,7 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -284,7 +284,7 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -360,7 +360,7 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -400,7 +400,7 @@
<description>Look for free-busy-set</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -423,7 +423,7 @@
<description>Look for free-busy-set fro default calendar</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
Modified: CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitcompatibility.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -73,7 +73,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -109,7 +109,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -151,7 +151,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -187,7 +187,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -240,7 +240,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -266,7 +266,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -274,7 +274,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -283,11 +283,11 @@
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<ruri>$calendarpath2:/</ruri>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<ruri>$calendarpath3:/</ruri>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/implicitcopymove.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitcopymove.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitcopymove.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -81,7 +81,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -117,7 +117,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -230,7 +230,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -274,7 +274,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -307,7 +307,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -323,7 +323,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -401,7 +401,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -417,7 +417,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -455,7 +455,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -491,7 +491,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -601,7 +601,7 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -635,7 +635,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -651,7 +651,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -689,7 +689,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -761,7 +761,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -797,7 +797,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -830,7 +830,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -846,7 +846,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -884,7 +884,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -920,7 +920,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -955,7 +955,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -989,7 +989,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1005,7 +1005,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1043,7 +1043,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1079,7 +1079,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1121,7 +1121,7 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1155,7 +1155,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1171,7 +1171,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1195,7 +1195,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1245,7 +1245,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1281,7 +1281,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1316,7 +1316,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1360,7 +1360,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1393,7 +1393,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1409,7 +1409,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1433,7 +1433,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1469,7 +1469,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1519,7 +1519,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1555,7 +1555,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1590,7 +1590,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1640,7 +1640,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1684,7 +1684,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1717,7 +1717,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1733,7 +1733,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1785,7 +1785,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1821,7 +1821,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1861,7 +1861,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1895,7 +1895,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1911,7 +1911,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1949,7 +1949,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1985,7 +1985,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2025,7 +2025,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2075,7 +2075,7 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2115,7 +2115,7 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2149,7 +2149,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -2165,7 +2165,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -2189,7 +2189,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2239,7 +2239,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2275,7 +2275,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2310,7 +2310,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2344,7 +2344,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -2360,7 +2360,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -2384,7 +2384,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2420,7 +2420,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2470,7 +2470,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2506,7 +2506,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2541,7 +2541,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2591,7 +2591,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -2635,7 +2635,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -2668,7 +2668,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -2684,7 +2684,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -28,7 +28,7 @@
<description>Look for empty property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -53,7 +53,7 @@
<description>Set property on Inbox</description>
<request print-response='no'>
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/defaultcalendar/4.xml</filepath>
@@ -71,7 +71,7 @@
<description>Verify property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -96,7 +96,7 @@
<description>Look for empty property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -118,7 +118,7 @@
<description>Set property on Inbox</description>
<request print-response='no'>
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/defaultcalendar/2.xml</filepath>
@@ -136,7 +136,7 @@
<description>Verify property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -161,7 +161,7 @@
<description>Set property on Inbox</description>
<request print-response='no'>
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/defaultcalendar/3.xml</filepath>
@@ -179,7 +179,7 @@
<description>Verify property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
Modified: CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -271,7 +271,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -307,7 +307,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -356,7 +356,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -400,7 +400,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -472,7 +472,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -508,7 +508,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -557,7 +557,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -601,7 +601,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -687,7 +687,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -723,7 +723,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -772,7 +772,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -808,7 +808,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -857,7 +857,7 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -876,7 +876,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -939,7 +939,7 @@
<description>Attendees delete Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -957,7 +957,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/trunk/scripts/tests/impliciterrors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/impliciterrors.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/impliciterrors.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -81,7 +81,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -89,7 +89,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/implicitprivateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitprivateevents.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitprivateevents.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -65,7 +65,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -84,7 +84,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -112,7 +112,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -154,7 +154,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -173,7 +173,7 @@
</request>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -201,7 +201,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -250,7 +250,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -276,7 +276,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -284,7 +284,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/implicitproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitproxy.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitproxy.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -71,7 +71,7 @@
<description>No items in user02 Inbox</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/proxy/4.xml</filepath>
@@ -103,7 +103,7 @@
<description>One item in user03 Inbox</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -142,7 +142,7 @@
<description>Proxy deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -184,7 +184,7 @@
<description>One item in user02 Inbox</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/implicit/proxy/4.xml</filepath>
@@ -216,7 +216,7 @@
<description>No item in user03 Inbox</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -418,7 +418,7 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
@@ -426,7 +426,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$userid2:">
<method>DELETEALL</method>
@@ -434,7 +434,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$userid3:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitrecur1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitrecur1.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitrecur1.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -69,7 +69,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -105,7 +105,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -154,7 +154,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -173,7 +173,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -201,7 +201,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -250,7 +250,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -269,7 +269,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -297,7 +297,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -346,7 +346,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -365,7 +365,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -393,7 +393,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -418,7 +418,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -426,7 +426,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -434,7 +434,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -472,7 +472,7 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -491,7 +491,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -538,7 +538,7 @@
<description>Attendees delete Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -556,7 +556,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -591,7 +591,7 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -610,7 +610,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -621,7 +621,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -640,7 +640,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -699,7 +699,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -707,7 +707,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -715,7 +715,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/implicitscenario1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitscenario1.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitscenario1.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -65,7 +65,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -84,7 +84,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -127,7 +127,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -169,7 +169,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -188,7 +188,7 @@
</request>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -236,7 +236,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -285,7 +285,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -304,7 +304,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -347,7 +347,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -389,7 +389,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -408,7 +408,7 @@
</request>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -451,7 +451,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -476,7 +476,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -484,7 +484,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -522,7 +522,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -541,7 +541,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -570,7 +570,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -612,7 +612,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -648,7 +648,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -683,7 +683,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -702,7 +702,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -763,7 +763,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -788,7 +788,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -796,7 +796,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -834,7 +834,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -870,7 +870,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -912,7 +912,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -948,7 +948,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -990,7 +990,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1026,7 +1026,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1051,7 +1051,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1059,7 +1059,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1097,7 +1097,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1116,7 +1116,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -1144,7 +1144,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1186,7 +1186,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1205,7 +1205,7 @@
</request>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -1233,7 +1233,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1282,7 +1282,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1301,7 +1301,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataString</callback>
<arg>
@@ -1329,7 +1329,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1378,7 +1378,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1442,7 +1442,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1499,7 +1499,7 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1539,7 +1539,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1547,7 +1547,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1585,7 +1585,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1604,7 +1604,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -1632,7 +1632,7 @@
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1681,7 +1681,7 @@
<description>Attendee no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1738,7 +1738,7 @@
<description>Organizer no Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1778,7 +1778,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1786,7 +1786,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/implicitscenario2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitscenario2.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitscenario2.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -69,7 +69,7 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -88,7 +88,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -135,7 +135,7 @@
<description>Attendees delete Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -153,7 +153,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -195,7 +195,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -231,7 +231,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -252,7 +252,7 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -309,7 +309,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -345,7 +345,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -366,7 +366,7 @@
<description>Attendee 1 no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -406,7 +406,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -414,7 +414,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -422,7 +422,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -630,9 +630,9 @@
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<ruri>$calendarpath2:/</ruri>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1508,11 +1508,11 @@
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<ruri>$calendarpath2:/</ruri>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<ruri>$calendarpath3:/</ruri>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/nonascii.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/nonascii.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -497,7 +497,7 @@
<description>POST with non-utf-8 data</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/nonascii/11.ics</filepath>
Modified: CalDAVTester/trunk/scripts/tests/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privatecomments.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/privatecomments.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -86,7 +86,7 @@
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -105,7 +105,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -152,7 +152,7 @@
<description>Attendees delete Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -170,7 +170,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -212,7 +212,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -248,7 +248,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -269,7 +269,7 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -329,7 +329,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -365,7 +365,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -386,7 +386,7 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -446,7 +446,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -482,7 +482,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -503,7 +503,7 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -563,7 +563,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -599,7 +599,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -620,7 +620,7 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -680,7 +680,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -716,7 +716,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -737,7 +737,7 @@
<description>Attendee 1 no Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -797,7 +797,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -833,7 +833,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -854,7 +854,7 @@
<description>Attendee 2 no Inbox Item</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -894,7 +894,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -902,7 +902,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -910,7 +910,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -948,7 +948,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -984,7 +984,7 @@
<description>Attendee deletes Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1026,7 +1026,7 @@
<description>Organizer Inbox Item</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1062,7 +1062,7 @@
<description>Organizer deletes Inbox Item</description>
<request print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1087,7 +1087,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1095,7 +1095,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -1103,7 +1103,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -1142,7 +1142,7 @@
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1178,7 +1178,7 @@
<description>Attendee deletes Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1304,7 +1304,7 @@
<description>Organizer Inbox Items</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -1340,7 +1340,7 @@
<description>Organizer deletes Inbox Items</description>
<request print-response='no'>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -1415,7 +1415,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -1423,7 +1423,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -1431,7 +1431,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</end>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privateevents.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/privateevents.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -355,7 +355,7 @@
<description>Do POST on Outbox with wrong data</description>
<request print-response="no">
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/privateevents/3.ics</filepath>
Modified: CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,15 +24,15 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</start>
@@ -77,7 +77,7 @@
<description>Initial REQUEST</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/outbox/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/1.ics</filepath>
@@ -91,7 +91,7 @@
<description>Make sure no resource exists</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -113,7 +113,7 @@
<description>Make sure no resource exists</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -135,7 +135,7 @@
<description>Make sure no resource exists</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
Modified: CalDAVTester/trunk/scripts/tests/schedulenomore.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulenomore.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/schedulenomore.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -28,7 +28,7 @@
<description>SCHEDULE on valid outbox</description>
<request>
<method>SCHEDULE</method>
- <ruri>$pathprefix1:/outbox/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<header>
<name>Organizer</name>
<value>$cuaddr1:</value>
Modified: CalDAVTester/trunk/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepost.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/schedulepost.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -28,7 +28,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -36,7 +36,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -44,7 +44,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>PUT</method>
@@ -88,27 +88,27 @@
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$outboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$outbox:/</ruri>
+ <ruri>$outboxpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</start>
@@ -117,7 +117,7 @@
<description>POST on invalid outbox</description>
<request print-response="no">
<method>POST</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -135,7 +135,7 @@
<description>POST with invalid content</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -153,7 +153,7 @@
<description>POST with invalid calendar data</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/1.txt</filepath>
@@ -171,7 +171,7 @@
<description>POST without METHOD property</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/2.txt</filepath>
@@ -189,7 +189,7 @@
<description>POST with invalid iTIP object</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/5.txt</filepath>
@@ -207,7 +207,7 @@
<description>POST without Recipient:</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/22.ics</filepath>
@@ -225,7 +225,7 @@
<description>POST with non-authorized Organizer:</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/4.txt</filepath>
@@ -243,7 +243,7 @@
<description>POST reply with too many Attendees:</description>
<request user="$userid2:" pswd="$pswd2:">
<method>POST</method>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$outboxpath2:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/17.txt</filepath>
@@ -261,7 +261,7 @@
<description>POST reply with non-authorized Attendee:</description>
<request user="$userid2:" pswd="$pswd2:">
<method>POST</method>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$outboxpath2:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/18.txt</filepath>
@@ -279,7 +279,7 @@
<description>POST reply with disabled Attendee:</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/20.ics</filepath>
@@ -300,7 +300,7 @@
<description>POST reply with disabled Organizer:</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/21.ics</filepath>
@@ -321,7 +321,7 @@
<description>POST which should work</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -335,7 +335,7 @@
<description>Make sure no resource exists</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -352,7 +352,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$pathprefix1:/$outbox:/</value>
+ <value>$outboxpath1:/</value>
</arg>
</verify>
</request>
@@ -361,7 +361,7 @@
<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>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -374,7 +374,7 @@
<callback>propfindItems</callback>
<arg>
<name>ignore</name>
- <value>$pathprefix2:/$inbox:/</value>
+ <value>$inboxpath2:/</value>
</arg>
<arg>
<name>okprops</name>
@@ -388,7 +388,7 @@
<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>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -401,7 +401,7 @@
<callback>propfindItems</callback>
<arg>
<name>ignore</name>
- <value>$pathprefix3:/$inbox:/</value>
+ <value>$inboxpath3:/</value>
</arg>
<arg>
<name>okprops</name>
@@ -415,7 +415,7 @@
<description>POST which should work (using relative principal addressing)</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -429,7 +429,7 @@
<description>POST which should work (using absolute principal addressing)</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -446,7 +446,7 @@
<description>Simple calendar-query for VEVENTs</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/13.xml</filepath>
@@ -464,7 +464,7 @@
<description>Simple calendar-query for VEVENTs</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/13.xml</filepath>
@@ -482,7 +482,7 @@
<description>Simple calendar-multiget for VEVENTs</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/14.xml</filepath>
@@ -500,7 +500,7 @@
<description>Simple calendar-multiget for VEVENTs</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/15.xml</filepath>
@@ -513,7 +513,7 @@
</arg>
<arg>
<name>badhrefs</name>
- <value>$pathprefix1:/$inbox:/1.ics</value>
+ <value>$inboxpath1:/1.ics</value>
</arg>
</verify>
</request>
@@ -522,7 +522,7 @@
<description>free-busy-query failure</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/16.xml</filepath>
@@ -540,7 +540,7 @@
<description>free-busy-query failure</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/16.xml</filepath>
@@ -561,7 +561,7 @@
<description>POST free busy</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/6.txt</filepath>
@@ -588,7 +588,7 @@
<description>POST free busy - recipients with failure</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/23.ics</filepath>
@@ -614,7 +614,7 @@
<description>POST free busy - check ATTENDEE presence</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/19.ics</filepath>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostacl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostacl.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/schedulepostacl.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -218,7 +218,7 @@
<!-- Set calendar-free-busy-set to the calendars only -->
<request>
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleacl/1.xml</filepath>
@@ -231,7 +231,7 @@
<description>POST free busy</description>
<request user="$userid2:" pswd='$pswd2:' print-response='no'>
<method>POST</method>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$outboxpath2:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleacl/3.ics</filepath>
@@ -255,7 +255,7 @@
<!-- Set calendar-free-busy-set back to default -->
<request>
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleacl/2.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,27 +24,27 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$outboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -57,7 +57,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/1.ics</filepath>
@@ -75,7 +75,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -93,7 +93,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -107,7 +107,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -139,7 +139,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -157,7 +157,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -174,7 +174,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/19.ics</filepath>
@@ -192,7 +192,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -210,7 +210,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -224,7 +224,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -256,7 +256,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -274,7 +274,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -295,7 +295,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/4.ics</filepath>
@@ -313,7 +313,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -331,7 +331,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -345,7 +345,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -377,7 +377,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -395,7 +395,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -416,7 +416,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/4.ics</filepath>
@@ -434,7 +434,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -451,7 +451,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$pathprefix1:/$outbox:/</value>
+ <value>$outboxpath1:/</value>
</arg>
</verify>
</request>
@@ -460,7 +460,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -474,7 +474,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -506,7 +506,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -524,7 +524,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -545,7 +545,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/7.ics</filepath>
@@ -563,7 +563,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -581,7 +581,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -595,7 +595,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -631,7 +631,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -649,7 +649,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -666,7 +666,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/9.ics</filepath>
@@ -684,7 +684,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -702,7 +702,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -716,7 +716,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -752,7 +752,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -770,7 +770,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -787,7 +787,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/11.ics</filepath>
@@ -805,7 +805,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -823,7 +823,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -837,7 +837,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -869,7 +869,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -887,7 +887,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -904,7 +904,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/14.ics</filepath>
@@ -922,7 +922,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -940,7 +940,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -954,7 +954,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -990,7 +990,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1008,7 +1008,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1025,7 +1025,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/16.ics</filepath>
@@ -1043,7 +1043,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1061,7 +1061,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1075,7 +1075,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1111,7 +1111,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1129,7 +1129,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1165,7 +1165,7 @@
<description>getctag on resource01 inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1184,7 +1184,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/18.ics</filepath>
@@ -1202,7 +1202,7 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1220,7 +1220,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1234,7 +1234,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1270,7 +1270,7 @@
<description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1288,7 +1288,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -1324,7 +1324,7 @@
<description>getctag on resource01 inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1347,27 +1347,27 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$outboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,19 +24,19 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -49,7 +49,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/1.ics</filepath>
@@ -67,7 +67,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -95,7 +95,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -112,7 +112,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/3.ics</filepath>
@@ -130,7 +130,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -158,7 +158,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -175,7 +175,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/5.ics</filepath>
@@ -193,7 +193,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -221,7 +221,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -238,7 +238,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/7.ics</filepath>
@@ -256,7 +256,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -284,7 +284,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -301,7 +301,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/8.ics</filepath>
@@ -319,7 +319,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -347,7 +347,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -364,7 +364,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/9.ics</filepath>
@@ -382,7 +382,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -410,7 +410,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -427,7 +427,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/11.ics</filepath>
@@ -445,7 +445,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -473,7 +473,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -490,7 +490,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/13.ics</filepath>
@@ -508,7 +508,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -536,7 +536,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -553,7 +553,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/15.ics</filepath>
@@ -571,7 +571,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -599,7 +599,7 @@
<description>Three items in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -616,7 +616,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/17.ics</filepath>
@@ -634,7 +634,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -662,7 +662,7 @@
<description>Three items in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -679,7 +679,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurcancel/19.ics</filepath>
@@ -697,7 +697,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -725,7 +725,7 @@
<description>Three items in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -740,19 +740,19 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,19 +24,19 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -49,7 +49,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurrequest/1.ics</filepath>
@@ -67,7 +67,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -95,7 +95,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -112,7 +112,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurrequest/4.ics</filepath>
@@ -130,7 +130,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -158,7 +158,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -175,7 +175,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurrequest/7.ics</filepath>
@@ -193,7 +193,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -221,7 +221,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -238,7 +238,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurrequest/10.ics</filepath>
@@ -256,7 +256,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -284,7 +284,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -301,7 +301,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurrequest/13.ics</filepath>
@@ -319,7 +319,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -347,7 +347,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -364,7 +364,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurrequest/16.ics</filepath>
@@ -382,7 +382,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -410,7 +410,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -427,7 +427,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurrequest/19.ics</filepath>
@@ -445,7 +445,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -473,7 +473,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -490,7 +490,7 @@
<description>Do POST</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurrequest/22.ics</filepath>
@@ -508,7 +508,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -522,7 +522,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -537,19 +537,19 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,19 +24,19 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -49,7 +49,7 @@
<description>Do POST of 5-day recurrence</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurspecial/1.ics</filepath>
@@ -67,7 +67,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -95,7 +95,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -109,7 +109,7 @@
<description>Do POST of 3rd-day override</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurspecial/3.ics</filepath>
@@ -127,7 +127,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -155,7 +155,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -169,7 +169,7 @@
<description>Do POST of 4th-day cancel</description>
<request>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleautorecurspecial/5.ics</filepath>
@@ -187,7 +187,7 @@
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -215,7 +215,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -230,19 +230,19 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$routboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -69,7 +69,7 @@
<description>POST free busy - no mask</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulemaskuid/6.ics</filepath>
@@ -91,7 +91,7 @@
<description>POST free busy - ok mask</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulemaskuid/7.ics</filepath>
@@ -113,7 +113,7 @@
<description>POST free busy - bad mask - no organizer</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulemaskuid/8.ics</filepath>
@@ -135,7 +135,7 @@
<description>POST free busy - bad mask - wrong organizer</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulemaskuid/9.ics</filepath>
@@ -160,7 +160,7 @@
<description>POST free busy - ok mask bad organizer</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulemaskuid/10.ics</filepath>
@@ -182,7 +182,7 @@
<description>POST free busy - ok mask no organizer</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>POST</method>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$outboxpath2:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulemaskuid/11.ics</filepath>
@@ -209,7 +209,7 @@
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -217,7 +217,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -225,7 +225,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,27 +24,27 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/outbox/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/outbox/</ruri>
+ <ruri>$outboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/outbox/</ruri>
+ <ruri>$outboxpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/$inbox:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
</start>
@@ -53,7 +53,7 @@
<description>Initial REQUEST</description>
<request print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/outbox/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/1.ics</filepath>
@@ -67,7 +67,7 @@
<description>Make sure no resource exists</description>
<request print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -84,7 +84,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$pathprefix1:/$outbox:/</value>
+ <value>$outboxpath1:/</value>
</arg>
</verify>
</request>
@@ -93,7 +93,7 @@
<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>
+ <ruri>$inboxpath2:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -115,7 +115,7 @@
<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>
+ <ruri>$inboxpath3:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
Modified: CalDAVTester/trunk/scripts/tests/scheduleprops.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/scheduleprops.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/scheduleprops.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -55,7 +55,7 @@
<description>PROPFIND inbox</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -77,7 +77,7 @@
<description>PROPPATCH valid calendar</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/3.xml</filepath>
@@ -95,7 +95,7 @@
<description>PROPPATCH invalid calendar</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/4.xml</filepath>
@@ -113,7 +113,7 @@
<description>PROPPATCH delete it - fails</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/5.xml</filepath>
@@ -131,7 +131,7 @@
<description>PROPPATCH valid calendar - reset it</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/3.xml</filepath>
@@ -166,7 +166,7 @@
<description>PROPPATCH - valid</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/6.xml</filepath>
@@ -194,7 +194,7 @@
<description>PROPPATCH - valid new calendar, invalid existing</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/7.xml</filepath>
@@ -212,7 +212,7 @@
<description>PROPPATCH - invalid new calendar, invalid existing</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/8.xml</filepath>
@@ -230,7 +230,7 @@
<description>PROPPATCH valid calendar - reset it</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/3.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -24,19 +24,19 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$outboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request end-delete="yes">
<method>PUT</method>
@@ -107,7 +107,7 @@
<description>POST invite to one valid user</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request auth='no' print-response='no'>
<method>POST</method>
@@ -132,7 +132,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -149,7 +149,7 @@
<description>POST invite to two valid users</description>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request auth='no' print-response='no'>
<method>POST</method>
@@ -174,7 +174,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -188,7 +188,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -323,19 +323,19 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix1:/$inbox:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$outboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/$inbox:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml 2008-12-13 03:15:45 UTC (rev 3525)
+++ CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml 2008-12-15 17:13:33 UTC (rev 3526)
@@ -28,7 +28,7 @@
<description>POST free busy one valid user</description>
<request print-response='yes'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/servertoserver/8.ics</filepath>
@@ -52,7 +52,7 @@
<description>POST invite one valid user</description>
<request print-response='yes'>
<method>POST</method>
- <ruri>$pathprefix1:/$outbox:/</ruri>
+ <ruri>$outboxpath1:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/servertoserver/9.ics</filepath>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081215/69bcf73b/attachment-0001.html>
More information about the calendarserver-changes
mailing list