[CalendarServer-changes] [683] CalDAVTester/trunk/scripts/tests
source_changes at macosforge.org
source_changes at macosforge.org
Tue Dec 5 08:14:00 PST 2006
Revision: 683
http://trac.macosforge.org/projects/calendarserver/changeset/683
Author: cdaboo at apple.com
Date: 2006-12-05 08:13:59 -0800 (Tue, 05 Dec 2006)
Log Message:
-----------
More substitutions.
Modified Paths:
--------------
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/schedulepostnormal.xml
Modified: CalDAVTester/trunk/scripts/tests/schedulenomore.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulenomore.xml 2006-12-05 16:13:11 UTC (rev 682)
+++ CalDAVTester/trunk/scripts/tests/schedulenomore.xml 2006-12-05 16:13:59 UTC (rev 683)
@@ -32,11 +32,11 @@
<method>SCHEDULE</method>
<header>
<name>Organizer</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
Modified: CalDAVTester/trunk/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepost.xml 2006-12-05 16:13:11 UTC (rev 682)
+++ CalDAVTester/trunk/scripts/tests/schedulepost.xml 2006-12-05 16:13:59 UTC (rev 683)
@@ -97,11 +97,11 @@
<method>POST</method>
<header>
<name>Organizer</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/inbox/</ruri>
<data>
@@ -123,11 +123,11 @@
<method>POST</method>
<header>
<name>Organizer</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -149,11 +149,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -175,11 +175,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -201,11 +201,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -227,7 +227,7 @@
<method>POST</method>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -253,7 +253,7 @@
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -275,7 +275,7 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -297,11 +297,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -323,11 +323,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user02 at example.com</value>
+ <value>$cuaddr2:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<ruri>$pathprefix2:/outbox/</ruri>
<data>
@@ -349,11 +349,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user02 at example.com</value>
+ <value>$cuaddr2:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<ruri>$pathprefix2:/outbox/</ruri>
<data>
@@ -378,11 +378,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -419,8 +419,8 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">mailto:user01 at example.com</href></value>
- <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">mailto:user02 at example.com</href><href xmlns="DAV:">mailto:user03 at example.com</href></value>
+ <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">$cuaddr1:</href></value>
+ <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">$cuaddr2:</href><href xmlns="DAV:">$cuaddr3:</href></value>
</arg>
</verify>
</request>
@@ -446,8 +446,8 @@
</arg>
<arg>
<name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">mailto:user01 at example.com</href></value>
- <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">mailto:user02 at example.com</href></value>
+ <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">$cuaddr1:</href></value>
+ <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">$cuaddr2:</href></value>
<value>urn:ietf:params:xml:ns:caldavschedule-state$<not-processed/></value>
</arg>
</verify>
@@ -474,8 +474,8 @@
</arg>
<arg>
<name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">mailto:user01 at example.com</href></value>
- <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">mailto:user03 at example.com</href></value>
+ <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">$cuaddr1:</href></value>
+ <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">$cuaddr3:</href></value>
<value>urn:ietf:params:xml:ns:caldavschedule-state$<not-processed/></value>
</arg>
</verify>
@@ -487,11 +487,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, $principal3:</value>
+ <value>$principal2:, $principal3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -517,11 +517,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$host:/principals/users/user01</value>
+ <value>$host:$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>$host:/principals/users/user02, $host:$principal3:</value>
+ <value>$host:$principal2:, $host:$principal3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -665,11 +665,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+ <value>$cuaddr2:, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -696,11 +696,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:broken at example.com, mailto:user03 at example.com</value>
+ <value>mailto:broken at example.com, $cuaddr3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostacl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostacl.xml 2006-12-05 16:13:11 UTC (rev 682)
+++ CalDAVTester/trunk/scripts/tests/schedulepostacl.xml 2006-12-05 16:13:59 UTC (rev 683)
@@ -235,11 +235,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>mailto:user02 at example.com</value>
+ <value>$cuaddr2:</value>
</header>
<header>
<name>Recipient</name>
- <value>mailto:user01 at example.com</value>
+ <value>$cuaddr1:</value>
</header>
<ruri>$pathprefix2:/outbox/</ruri>
<data>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2006-12-05 16:13:11 UTC (rev 682)
+++ CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2006-12-05 16:13:59 UTC (rev 683)
@@ -42,15 +42,15 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</ruri>
</request>
</start>
@@ -61,11 +61,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, /principals/users/resource01</value>
+ <value>$principal2:, $rprincipal1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -113,7 +113,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -127,7 +127,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</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>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -174,11 +174,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, /principals/users/resource01</value>
+ <value>$principal2:, $rprincipal1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -226,7 +226,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -240,7 +240,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</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>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</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>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -313,11 +313,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, /principals/users/resource01</value>
+ <value>$principal2:, $rprincipal1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -365,7 +365,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -379,7 +379,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</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>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</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>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -452,11 +452,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, /principals/users/resource01</value>
+ <value>$principal2:, $rprincipal1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -504,7 +504,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -518,7 +518,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -536,7 +536,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -569,11 +569,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, /principals/users/resource01</value>
+ <value>$principal2:, $rprincipal1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -621,7 +621,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -635,7 +635,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -653,7 +653,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -686,11 +686,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, /principals/users/resource01</value>
+ <value>$principal2:, $rprincipal1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -738,7 +738,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -752,7 +752,7 @@
<description>One item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</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>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -799,11 +799,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, /principals/users/resource01</value>
+ <value>$principal2:, $rprincipal1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -851,7 +851,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -865,7 +865,7 @@
<description>Two items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -883,7 +883,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -916,11 +916,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, /principals/users/resource01</value>
+ <value>$principal2:, $rprincipal1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -968,7 +968,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -982,7 +982,7 @@
<description>Two items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1000,7 +1000,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1033,11 +1033,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, /principals/users/resource01</value>
+ <value>$principal2:, $rprincipal1:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -1085,7 +1085,7 @@
<description>One item in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GETNEW</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
<verify>
<callback>dataMatch</callback>
<arg>
@@ -1099,7 +1099,7 @@
<description>Two items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleauto/6.xml</filepath>
@@ -1117,7 +1117,7 @@
<description>One item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <ruri>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</ruri>
<verify>
<callback>multistatusItems</callback>
<arg>
@@ -1162,15 +1162,15 @@
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>/calendars/users/resource01/outbox/</ruri>
+ <ruri>$rpathprefix1:/outbox/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>/calendars/users/resource01/inbox/</ruri>
+ <ruri>$rpathprefix1:/inbox/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>/calendars/users/resource01/calendar/</ruri>
+ <ruri>$rpathprefix1:/calendar/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2006-12-05 16:13:11 UTC (rev 682)
+++ CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2006-12-05 16:13:59 UTC (rev 683)
@@ -57,11 +57,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user01</value>
+ <value>$principal:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user02, $principal3:</value>
+ <value>$principal2:, $principal3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -166,11 +166,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>/principals/users/user02</value>
+ <value>$principal2:</value>
</header>
<header>
<name>Recipient</name>
- <value>/principals/users/user01</value>
+ <value>$principal3:</value>
</header>
<ruri>$pathprefix2:/outbox/</ruri>
<data>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061205/0ddc711c/attachment.html
More information about the calendarserver-changes
mailing list