[CalendarServer-changes] [3410] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Nov 25 08:47:53 PST 2008


Revision: 3410
          http://trac.macosforge.org/projects/calendarserver/changeset/3410
Author:   cdaboo at apple.com
Date:     2008-11-25 08:47:52 -0800 (Tue, 25 Nov 2008)
Log Message:
-----------
Remove requirement for Originator/Recipient headers when doing "internal" CalDAV scheduling.

Modified Paths:
--------------
    CalDAVTester/trunk/performance/schedule-freebusy/schedule-small.xml
    CalDAVTester/trunk/performance/schedule-freebusy/schedule-tests.xml
    CalDAVTester/trunk/performance/schedule-invite/schedule-small.xml
    CalDAVTester/trunk/performance/schedule-invite/schedule-tests.xml
    CalDAVTester/trunk/scripts/tests/availability.xml
    CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
    CalDAVTester/trunk/scripts/tests/errors.xml
    CalDAVTester/trunk/scripts/tests/nonascii.xml
    CalDAVTester/trunk/scripts/tests/privateevents.xml
    CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.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/servertoserverincoming.xml
    CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/calendaruserproxy/13.ics
    CalDAVTester/trunk/Resource/errors/35.ics
    CalDAVTester/trunk/Resource/schedule/22.ics
    CalDAVTester/trunk/Resource/schedule/23.ics

Added: CalDAVTester/trunk/Resource/calendaruserproxy/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/calendaruserproxy/13.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/calendaruserproxy/13.ics	2008-11-25 16:47:52 UTC (rev 3410)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:54E181BC7CCC373042B28842 at ninevah.local
+ORGANIZER;CN=User 01:$cuaddralt2:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/errors/35.ics
===================================================================
--- CalDAVTester/trunk/Resource/errors/35.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/errors/35.ics	2008-11-25 16:47:52 UTC (rev 3410)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=User 01:urn:uuid:bogus-uuid
+ATTENDEE;CN=User 02:$cuaddr2:
+ATTENDEE;CN=User 03:$cuaddr3:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060102T000000Z
+END:VFREEBUSY
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/schedule/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedule/22.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/schedule/22.ics	2008-11-25 16:47:52 UTC (rev 3410)
@@ -0,0 +1,33 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:54E181BC7CCC373042B28842 at ninevah.local
+ORGANIZER;CN=User 01:$cuaddr1:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/schedule/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedule/23.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/schedule/23.ics	2008-11-25 16:47:52 UTC (rev 3410)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02:mailto:broken at example.com
+ATTENDEE;CN=User 03:$cuaddr3:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060102T000000Z
+END:VFREEBUSY
+END:VCALENDAR

Modified: CalDAVTester/trunk/performance/schedule-freebusy/schedule-small.xml
===================================================================
--- CalDAVTester/trunk/performance/schedule-freebusy/schedule-small.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/performance/schedule-freebusy/schedule-small.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -52,14 +52,6 @@
 			<description>POST to Outbox of regular invite</description>
 			<request print-response="no">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$principal1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/performance/schedule-freebusy/schedule-tests.xml
===================================================================
--- CalDAVTester/trunk/performance/schedule-freebusy/schedule-tests.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/performance/schedule-freebusy/schedule-tests.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -51,14 +51,6 @@
 			<description>POST to Outbox of regular invite - small</description>
 			<request print-response="yes">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$principal1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -73,14 +65,6 @@
 			<description>POST to Outbox of regular invite - small</description>
 			<request print-response="yes">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$principal1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:, $principal3:, $principals:user04, $principals:user05, $principals:user06, $principals:user07, $principals:user08, $principals:user09, $principals:user10, $principals:user11</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -95,14 +79,6 @@
 			<description>POST to Outbox of regular invite - small</description>
 			<request print-response="no">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$principal1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:, $principal3:, $principals:user04, $principals:user05, $principals:user06, $principals:user07, $principals:user08, $principals:user09, $principals:user10, $principals:user11, $principals:user12, $principals:user13, $principals:user14, $principals:user15, $principals:user16, $principals:user17, $principals:user18, $principals:user19, $principals:user20, $principals:user21, $principals:user22, $principals:user23, $principals:user24, $principals:user25, $principals:user26, $principals:user27, $principals:user28, $principals:user29, $principals:user30, $principals:user31, $principals:user32, $principals:user33, $principals:user34, $principals:user35, $principals:user36, $principals:user37, $principals:user38, $principals:user39, $principals:user40, $principals:user41, $principals:user42, $principals:user43, $principals:user44, $principals:user45, $principals:user46, $principals:user47, $principals:user48, $principals:user49, $principals:user50, $principa
 ls:user51, $principals:user52, $principals:user53, $principals:user54, $principals:user55, $principals:user56, $principals:user57, $principals:user58, $principals:user59, $principals:user60, $principals:user61, $principals:user62, $principals:user63, $principals:user64, $principals:user65, $principals:user66, $principals:user67, $principals:user68, $principals:user69, $principals:user70, $principals:user71, $principals:user72, $principals:user73, $principals:user74, $principals:user75, $principals:user76, $principals:user77, $principals:user78, $principals:user79, $principals:user80, $principals:user81, $principals:user82, $principals:user83, $principals:user84, $principals:user85, $principals:user86, $principals:user87, $principals:user88, $principals:user89, $principals:user90, $principals:user91, $principals:user92, $principals:user93, $principals:user94, $principals:user95, $principals:user96, $principals:user97, $principals:user98, $principals:user99</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/performance/schedule-invite/schedule-small.xml
===================================================================
--- CalDAVTester/trunk/performance/schedule-invite/schedule-small.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/performance/schedule-invite/schedule-small.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -52,14 +52,6 @@
 			<description>POST to Outbox of regular invite</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$principal1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:, $principal3:</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/performance/schedule-invite/schedule-tests.xml
===================================================================
--- CalDAVTester/trunk/performance/schedule-invite/schedule-tests.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/performance/schedule-invite/schedule-tests.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -53,13 +53,6 @@
 			<request>
 				<method>POST</method>
 				<header>
-					<name>Originator</name>
-					<value>$principal1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:, $principal3:</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -81,14 +74,6 @@
 			<description>POST to Outbox of regular invite - medium</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$principal1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:, $principal3:</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -110,14 +95,6 @@
 			<description>POST to Outbox of regular invite - large</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$principal1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:, $principal3:</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/availability.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/availability.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -459,14 +459,6 @@
 			<description>query for free busy with time range</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr1:</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -263,14 +263,6 @@
 			<description>Verify no access for scheduling</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$principal2:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:, $principal3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -483,14 +475,6 @@
 			<description>Verify access for scheduling</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt2:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $cuaddralt3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -505,18 +489,10 @@
 			<description>Verify no access for scheduling</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$principal1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$principal2:, $principal3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/calendaruserproxy/9.ics</filepath>
+					<filepath>Resource/calendaruserproxy/13.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>

Modified: CalDAVTester/trunk/scripts/tests/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/errors.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/errors.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -1226,18 +1226,10 @@
 			<description>POST free busy</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>urn:uuid:bogus-uuid</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/6.txt</filepath>
+					<filepath>Resource/errors/35.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>

Modified: CalDAVTester/trunk/scripts/tests/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/nonascii.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/nonascii.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -494,14 +494,6 @@
 			<description>POST with non-utf-8 data</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privateevents.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/privateevents.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -355,14 +355,6 @@
 			<description>Do POST on Outbox with wrong data</description>
 			<request print-response="no">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/scheduleimplicit-compatability.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -77,14 +77,6 @@
 			<description>Initial REQUEST</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $cuaddralt3:</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepost.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/schedulepost.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -117,14 +117,6 @@
 			<description>POST on invalid outbox</description>
 			<request print-response="no">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$inbox:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
@@ -143,14 +135,6 @@
 			<description>POST with invalid content</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
@@ -169,14 +153,6 @@
 			<description>POST with invalid calendar data</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -195,14 +171,6 @@
 			<description>POST without METHOD property</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -221,14 +189,6 @@
 			<description>POST with invalid iTIP object</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -244,65 +204,13 @@
 			</request>
 		</test>
 		<test name='6' ignore='no'>
-			<description>POST without Originator:</description>
-			<request>
-				<method>POST</method>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
-				<ruri>$pathprefix1:/$outbox:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator-specified</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>POST with non-authorized Originator:</description>
-			<request print-response='no'>
-				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01-bogus at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
-				<ruri>$pathprefix1:/$outbox:/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator-allowed</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='8' ignore='no'>
 			<description>POST without Recipient:</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
+					<filepath>Resource/schedule/22.ics</filepath>
 				</data>
 				<verify>
 					<callback>prepostcondition</callback>
@@ -313,18 +221,10 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='7' ignore='no'>
 			<description>POST with non-authorized Organizer:</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -339,18 +239,10 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='8' ignore='no'>
 			<description>POST reply with too many Attendees:</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr2:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr1:</value>
-				</header>
 				<ruri>$pathprefix2:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -365,18 +257,10 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='9' ignore='no'>
 			<description>POST reply with non-authorized Attendee:</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr2:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr1:</value>
-				</header>
 				<ruri>$pathprefix2:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -391,18 +275,10 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='10' ignore='no'>
 			<description>POST reply with disabled Attendee:</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddrdisabled:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -420,18 +296,10 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='11' ignore='no'>
 			<description>POST reply with disabled Organizer:</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddrdisabled:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -453,14 +321,6 @@
 			<description>POST which should work</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -555,14 +415,6 @@
 			<description>POST which should work (using relative principal addressing)</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $cuaddralt3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -577,14 +429,6 @@
 			<description>POST which should work (using absolute principal addressing)</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$host:$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$host:$cuaddralt2:, $host:$cuaddralt3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -717,14 +561,6 @@
 			<description>POST free busy</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -752,18 +588,10 @@
 			<description>POST free busy - recipients with failure</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:broken at example.com, $cuaddr3:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/6.txt</filepath>
+					<filepath>Resource/schedule/23.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -786,14 +614,6 @@
 			<description>POST free busy - check ATTENDEE presence</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddraltnoslash1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddraltnoslash2:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/schedulepostacl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostacl.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/schedulepostacl.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -231,14 +231,6 @@
 			<description>POST free busy</description>
 			<request user="$userid2:" pswd='$pswd2:' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr2:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr1:</value>
-				</header>
 				<ruri>$pathprefix2:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostauto.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/schedulepostauto.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -57,14 +57,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -182,14 +174,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -311,14 +295,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -440,14 +416,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -577,14 +545,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -706,14 +666,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -835,14 +787,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -960,14 +904,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -1089,14 +1025,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -1256,14 +1184,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/schedulepostautorecurcancel.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -49,14 +49,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -120,14 +112,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -191,14 +175,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -262,14 +238,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -333,14 +301,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -404,14 +364,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -475,14 +427,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -546,14 +490,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -617,14 +553,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -688,14 +616,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -759,14 +679,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/schedulepostautorecurrequest.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -49,14 +49,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -120,14 +112,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -191,14 +175,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -262,14 +238,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -333,14 +301,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -404,14 +364,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -475,14 +427,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -546,14 +490,6 @@
 			<description>Do POST</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/schedulepostautorecurspecial.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -49,14 +49,6 @@
 			<description>Do POST of 5-day recurrence</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -117,14 +109,6 @@
 			<description>Do POST of 3rd-day override</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -185,14 +169,6 @@
 			<description>Do POST of 4th-day cancel</description>
 			<request>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$rcuaddralt1:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -69,14 +69,6 @@
 			<description>POST free busy - no mask</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -99,14 +91,6 @@
 			<description>POST free busy - ok mask</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -129,14 +113,6 @@
 			<description>POST free busy - bad mask - no organizer</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -159,14 +135,6 @@
 			<description>POST free busy - bad mask - wrong organizer</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -192,14 +160,6 @@
 			<description>POST free busy - ok mask bad organizer</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -222,14 +182,6 @@
 			<description>POST free busy - ok mask no organizer</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr2:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:</value>
-				</header>
 				<ruri>$pathprefix2:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -53,14 +53,6 @@
 			<description>Initial REQUEST</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddralt1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddralt2:, $cuaddralt3:</value>
-				</header>
 				<ruri>$pathprefix1:/outbox/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/servertoserverincoming.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -61,14 +61,6 @@
 			<description>POST free busy one valid user</description>
 			<request auth='no' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr1:</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -90,14 +82,6 @@
 			<description>POST free busy two valid users</description>
 			<request auth='no' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr1:,$cuaddr2:</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -127,14 +111,6 @@
 			</request>
 			<request auth='no' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr1:</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -177,14 +153,6 @@
 			</request>
 			<request auth='no' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr1:, $cuaddr2:</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -237,14 +205,6 @@
 			<description>POST authenticated</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -263,14 +223,6 @@
 			<description>POST local originator</description>
 			<request auth='no' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -289,14 +241,6 @@
 			<description>POST invalid local recipient</description>
 			<request auth='no' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:bogus at example.com</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -318,14 +262,6 @@
 			<description>POST remote recipient</description>
 			<request auth='no' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:remote02 at example.org</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -347,14 +283,6 @@
 			<description>POST local organizer</description>
 			<request auth='no' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr2:</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -373,14 +301,6 @@
 			<description>POST local attendee reply</description>
 			<request auth='no' print-response='no'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$cuaddr1:</value>
-				</header>
 				<ruri>$servertoserver:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>

Modified: CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml	2008-11-25 16:47:04 UTC (rev 3409)
+++ CalDAVTester/trunk/scripts/tests/servertoserveroutgoing.xml	2008-11-25 16:47:52 UTC (rev 3410)
@@ -28,14 +28,6 @@
 			<description>POST free busy one valid user</description>
 			<request print-response='yes'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -60,14 +52,6 @@
 			<description>POST invite one valid user</description>
 			<request print-response='yes'>
 				<method>POST</method>
-				<header>
-					<name>Originator</name>
-					<value>$cuaddr1:</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:remote01 at example.org</value>
-				</header>
 				<ruri>$pathprefix1:/$outbox:/</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081125/96ca55b3/attachment-0001.html>


More information about the calendarserver-changes mailing list