[CalendarServer-changes] [1123] CalDAVTester/trunk/scripts/tests
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jan 29 15:05:16 PST 2007
Revision: 1123
http://trac.macosforge.org/projects/calendarserver/changeset/1123
Author: cdaboo at apple.com
Date: 2007-01-29 15:05:16 -0800 (Mon, 29 Jan 2007)
Log Message:
-----------
Make inbox/outbox names configurable.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/schedulepost.xml
CalDAVTester/trunk/scripts/tests/schedulepostacl.xml
CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
Modified: CalDAVTester/trunk/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepost.xml 2007-01-29 22:57:23 UTC (rev 1122)
+++ CalDAVTester/trunk/scripts/tests/schedulepost.xml 2007-01-29 23:05:16 UTC (rev 1123)
@@ -66,34 +66,34 @@
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/outbox/</ruri>
+ <ruri>$pathprefix2:/$outbox:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/outbox/</ruri>
+ <ruri>$pathprefix3:/$outbox:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/inbox/</ruri>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
</request>
</start>
<test-suite name='POST Errors' ignore='no'>
<test name='1' ignore='no'>
<description>POST on invalid outbox</description>
- <request>
+ <request print-response="yes">
<method>POST</method>
<header>
<name>Organizer</name>
@@ -103,7 +103,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -129,7 +129,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -155,7 +155,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/1.txt</filepath>
@@ -181,7 +181,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/2.txt</filepath>
@@ -207,7 +207,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/5.txt</filepath>
@@ -229,7 +229,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -255,7 +255,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -277,7 +277,7 @@
<name>Originator</name>
<value>$cuaddr1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -303,7 +303,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/4.txt</filepath>
@@ -329,7 +329,7 @@
<name>Recipient</name>
<value>$cuaddr1:</value>
</header>
- <ruri>$pathprefix2:/outbox/</ruri>
+ <ruri>$pathprefix2:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/17.txt</filepath>
@@ -355,7 +355,7 @@
<name>Recipient</name>
<value>$cuaddr1:</value>
</header>
- <ruri>$pathprefix2:/outbox/</ruri>
+ <ruri>$pathprefix2:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/18.txt</filepath>
@@ -384,7 +384,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -396,7 +396,7 @@
<callback>header</callback>
<arg>
<name>header</name>
- <value>Location$^$pathprefix:/outbox/[^/]+\.ics$</value>
+ <value>Location$^$pathprefix:/$outbox:/[^/]+\.ics$</value>
</arg>
</verify>
<grablocation/>
@@ -433,7 +433,7 @@
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/12.xml</filepath>
@@ -442,7 +442,7 @@
<callback>propfindItems</callback>
<arg>
<name>ignore</name>
- <value>$pathprefix2:/inbox/</value>
+ <value>$pathprefix2:/$inbox:/</value>
</arg>
<arg>
<name>okprops</name>
@@ -461,7 +461,7 @@
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/inbox/</ruri>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/12.xml</filepath>
@@ -470,7 +470,7 @@
<callback>propfindItems</callback>
<arg>
<name>ignore</name>
- <value>$pathprefix3:/inbox/</value>
+ <value>$pathprefix3:/$inbox:/</value>
</arg>
<arg>
<name>okprops</name>
@@ -493,7 +493,7 @@
<name>Recipient</name>
<value>$principal2:, $principal3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -505,7 +505,7 @@
<callback>header</callback>
<arg>
<name>header</name>
- <value>Location$^$pathprefix:/outbox/[^/]+\.ics$</value>
+ <value>Location$^$pathprefix:/$outbox:/[^/]+\.ics$</value>
</arg>
</verify>
<grablocation/>
@@ -523,7 +523,7 @@
<name>Recipient</name>
<value>$host:$principal2:, $host:$principal3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/3.txt</filepath>
@@ -535,7 +535,7 @@
<callback>header</callback>
<arg>
<name>header</name>
- <value>Location$^$pathprefix:/outbox/[^/]+\.ics$</value>
+ <value>Location$^$pathprefix:/$outbox:/[^/]+\.ics$</value>
</arg>
</verify>
<grablocation/>
@@ -548,7 +548,7 @@
<description>Simple calendar-query for VEVENTs</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/13.xml</filepath>
@@ -566,7 +566,7 @@
<description>Simple calendar-query for VEVENTs</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/13.xml</filepath>
@@ -584,7 +584,7 @@
<description>Simple calendar-multiget for VEVENTs</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/14.xml</filepath>
@@ -602,7 +602,7 @@
<description>Simple calendar-multiget for VEVENTs</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/15.xml</filepath>
@@ -615,7 +615,7 @@
</arg>
<arg>
<name>badhrefs</name>
- <value>$pathprefix:/inbox/1.ics</value>
+ <value>$pathprefix:/$inbox:/1.ics</value>
</arg>
</verify>
</request>
@@ -624,7 +624,7 @@
<description>free-busy-query failure</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/16.xml</filepath>
@@ -642,7 +642,7 @@
<description>free-busy-query failure</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/16.xml</filepath>
@@ -671,7 +671,7 @@
<name>Recipient</name>
<value>$cuaddr2:, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/6.txt</filepath>
@@ -702,7 +702,7 @@
<name>Recipient</name>
<value>mailto:broken at example.com, $cuaddr3:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/schedule/6.txt</filepath>
@@ -732,7 +732,7 @@
<name>Recipient</name>
<value>$principal2noslash:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</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 2007-01-29 22:57:23 UTC (rev 1122)
+++ CalDAVTester/trunk/scripts/tests/schedulepostacl.xml 2007-01-29 23:05:16 UTC (rev 1123)
@@ -220,7 +220,7 @@
<!-- Set calendar-free-busy-set to the calendars only -->
<request>
<method>PROPPATCH</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleacl/1.xml</filepath>
@@ -241,7 +241,7 @@
<name>Recipient</name>
<value>$cuaddr1:</value>
</header>
- <ruri>$pathprefix2:/outbox/</ruri>
+ <ruri>$pathprefix2:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleacl/3.ics</filepath>
@@ -265,7 +265,7 @@
<!-- Set calendar-free-busy-set back to default -->
<request>
<method>PROPPATCH</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</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 2007-01-29 22:57:23 UTC (rev 1122)
+++ CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2007-01-29 23:05:16 UTC (rev 1123)
@@ -26,27 +26,27 @@
<start>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/outbox/</ruri>
+ <ruri>$pathprefix2:/$outbox:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -67,7 +67,7 @@
<name>Recipient</name>
<value>$principal2:, $rprincipal1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/1.ics</filepath>
@@ -85,7 +85,7 @@
<description>One item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -99,7 +99,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -113,7 +113,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -141,7 +141,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -155,7 +155,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -180,7 +180,7 @@
<name>Recipient</name>
<value>$principal2:, $rprincipal1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/4.ics</filepath>
@@ -198,7 +198,7 @@
<description>One item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -212,7 +212,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -226,7 +226,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -254,7 +254,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -272,7 +272,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -290,7 +290,7 @@
<description>One item in resource01 Inbox (old one deleted)</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -319,7 +319,7 @@
<name>Recipient</name>
<value>$principal2:, $rprincipal1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/4.ics</filepath>
@@ -337,7 +337,7 @@
<description>One item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -351,7 +351,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -365,7 +365,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -393,7 +393,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -411,7 +411,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -429,7 +429,7 @@
<description>One item in resource01 Inbox (old one deleted)</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -458,7 +458,7 @@
<name>Recipient</name>
<value>$principal2:, $rprincipal1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/7.ics</filepath>
@@ -476,7 +476,7 @@
<description>One item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -490,7 +490,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -504,7 +504,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -536,7 +536,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -550,7 +550,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -575,7 +575,7 @@
<name>Recipient</name>
<value>$principal2:, $rprincipal1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/9.ics</filepath>
@@ -593,7 +593,7 @@
<description>One item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -607,7 +607,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -621,7 +621,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -653,7 +653,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -667,7 +667,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -692,7 +692,7 @@
<name>Recipient</name>
<value>$principal2:, $rprincipal1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/11.ics</filepath>
@@ -710,7 +710,7 @@
<description>One item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -724,7 +724,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -738,7 +738,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -766,7 +766,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -780,7 +780,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -805,7 +805,7 @@
<name>Recipient</name>
<value>$principal2:, $rprincipal1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/14.ics</filepath>
@@ -823,7 +823,7 @@
<description>One item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -837,7 +837,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -851,7 +851,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -883,7 +883,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -897,7 +897,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -922,7 +922,7 @@
<name>Recipient</name>
<value>$principal2:, $rprincipal1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/16.ics</filepath>
@@ -940,7 +940,7 @@
<description>One item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -954,7 +954,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -968,7 +968,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1000,7 +1000,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1014,7 +1014,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1039,7 +1039,7 @@
<name>Recipient</name>
<value>$principal2:, $rprincipal1:</value>
</header>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/18.ics</filepath>
@@ -1057,7 +1057,7 @@
<description>One item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1071,7 +1071,7 @@
<description>One item in user02 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1085,7 +1085,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1117,7 +1117,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -1131,7 +1131,7 @@
<description>One item in user01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -1146,27 +1146,27 @@
<end>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix:/outbox/</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/outbox/</ruri>
+ <ruri>$pathprefix2:/$outbox:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/outbox/</ruri>
+ <ruri>$rpathprefix1:/$outbox:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rpathprefix1:/inbox/</ruri>
+ <ruri>$rpathprefix1:/$inbox:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2007-01-29 22:57:23 UTC (rev 1122)
+++ CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2007-01-29 23:05:16 UTC (rev 1123)
@@ -30,7 +30,7 @@
</request>
<request>
<method>DELETEALL</method>
- <ruri>$pathprefix:/inbox/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
@@ -38,7 +38,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
@@ -46,7 +46,7 @@
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$pathprefix3:/inbox/</ruri>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
</request>
</start>
@@ -112,7 +112,7 @@
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix2:/inbox/</ruri>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/3.xml</filepath>
@@ -121,7 +121,7 @@
<callback>propfindItems</callback>
<arg>
<name>ignore</name>
- <value>$pathprefix2:/inbox/</value>
+ <value>$pathprefix2:/$inbox:/</value>
</arg>
<arg>
<name>okprops</name>
@@ -140,7 +140,7 @@
<name>Depth</name>
<value>1</value>
</header>
- <ruri>$pathprefix3:/inbox/</ruri>
+ <ruri>$pathprefix3:/$inbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/3.xml</filepath>
@@ -149,7 +149,7 @@
<callback>propfindItems</callback>
<arg>
<name>ignore</name>
- <value>$pathprefix3:/inbox/</value>
+ <value>$pathprefix3:/$inbox:/</value>
</arg>
<arg>
<name>okprops</name>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070129/44bf3265/attachment.html
More information about the calendarserver-changes
mailing list