[CalendarServer-changes] [5597] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu May 13 08:32:46 PDT 2010
Revision: 5597
http://trac.macosforge.org/projects/calendarserver/changeset/5597
Author: cdaboo at apple.com
Date: 2010-05-13 08:32:43 -0700 (Thu, 13 May 2010)
Log Message:
-----------
Clean-up some "static" path references.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/6.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/9.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/7.ics
CalDAVTester/trunk/Resource/CalDAV/reports/put/23.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/5.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml
CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml
CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml
CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml
CalDAVTester/trunk/scripts/tests/CardDAV/resourceid.xml
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/6.ics 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/no-organizer/6.ics 2010-05-13 15:32:43 UTC (rev 5597)
@@ -25,13 +25,11 @@
DTSTART;TZID=US/Eastern:20060102T110000
DURATION:PT1H
RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=user01 at exampl
- e.com:$cuaddrurn1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;EMAIL=use
- r02 at example.com:$cuaddrurn2:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS=1.2;EMAIL=user01 at example.com:$cuaddrurn1:
+ORGANIZER;CN=User 01;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 2.1
STATUS:CANCELLED
END:VEVENT
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/9.ics 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/recurring-alarms/9.ics 2010-05-13 15:32:43 UTC (rev 5597)
@@ -24,11 +24,11 @@
UID:event4-1 at ninevah.local
DTSTART;TZID=US/Eastern:20060101T100000
DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=user01 at example.com:$cuaddrurn1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=user02 at example.com:$cuaddrurn2:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS=1.2;EMAIL=user01 at example.com:$cuaddrurn1:
+ORGANIZER;CN=User 01;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 4-1 changed
RRULE:FREQ=DAILY;COUNT=3
TRANSP:TRANSPARENT
@@ -38,11 +38,11 @@
UID:event4-1 at ninevah.local
DTSTART;TZID=US/Eastern:20060102T100000
DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=user01 at example.com:$cuaddrurn1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=user02 at example.com:$cuaddrurn2:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS=1.2;EMAIL=user01 at example.com:$cuaddrurn1:
+ORGANIZER;CN=User 01;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 4-1 changed
TRANSP:TRANSPARENT
X-APPLE-NEEDS-REPLY:TRUE
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/7.ics 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/organizerdelete/7.ics 2010-05-13 15:32:43 UTC (rev 5597)
@@ -24,13 +24,11 @@
UID:event2 at ninevah.local
DTSTART;TZID=US/Eastern:20060101T100000
DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=user01 at exampl
- e.com:$cuaddrurn1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;EMAIL=use
- r02 at example.com:$cuaddrurn2:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS=1.2;EMAIL=user01 at example.com:$cuaddrurn1:
+ORGANIZER;CN=User 01;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 2
STATUS:CANCELLED
END:VTODO
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/23.ics 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/23.ics 2010-05-13 15:32:43 UTC (rev 5597)
@@ -23,11 +23,11 @@
UID:DAFCEADF-A646-4D71-B6A8-E3C090849206
DTSTART;TZID=America/New_York:20091119T100000
DTEND;TZID=America/New_York:20091119T110000
-ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=user01 at example.com;PARTSTAT=AC
- CEPTED:urn:uuid:user01
+ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=$email1:;PARTSTAT=AC
+ CEPTED:$cuaddrurn1:
CREATED:20091118T034738Z
DTSTAMP:20091118T034759Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:uuid:user01
+ORGANIZER;CN=User 01;EMAIL=$email1::$cuaddrurn1:
RRULE:FREQ=DAILY;COUNT=400
SEQUENCE:3
SUMMARY:New Event
@@ -38,11 +38,11 @@
RECURRENCE-ID;TZID=America/New_York:20091120T100000
DTSTART;TZID=America/New_York:20091119T120000
DTEND;TZID=America/New_York:20091119T130000
-ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=user01 at example.com;PARTSTAT=AC
- CEPTED:urn:uuid:user01
+ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=$email1:;PARTSTAT=AC
+ CEPTED:$cuaddrurn1:
CREATED:20091118T034738Z
DTSTAMP:20091118T034809Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:uuid:user01
+ORGANIZER;CN=User 01;EMAIL=$email1::$cuaddrurn1:
SEQUENCE:5
SUMMARY:New Event
TRANSP:OPAQUE
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/1.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:set>
- <D:href>mailto:user02 at example.com</D:href>
+ <D:href>$cuaddr2:</D:href>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read/>
</CS:set>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/2.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -2,16 +2,16 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-accepted/>
<access>
<read/>
</access>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<organizer>
- <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+ <href xmlns='DAV:'>$principaluri1:</href>
<common-name>User 01</common-name>
</organizer>
<summary>My Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only/3.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-accepted/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/1.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:set>
- <D:href>mailto:user02 at example.com</D:href>
+ <D:href>$cuaddr2:</D:href>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read-write/>
</CS:set>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/2.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -2,16 +2,16 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-noresponse/>
<access>
<read-write/>
</access>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<organizer>
- <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+ <href xmlns='DAV:'>$principaluri1:</href>
<common-name>User 01</common-name>
</organizer>
<summary>My Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/3.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-accepted/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/1.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:set>
- <D:href>mailto:user02 at example.com</D:href>
+ <D:href>$cuaddr2:</D:href>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read-write/>
</CS:set>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/new/2.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -2,16 +2,16 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-noresponse/>
<access>
<read-write/>
</access>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<organizer>
- <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+ <href xmlns='DAV:'>$principaluri1:</href>
<common-name>User 01</common-name>
</organizer>
<summary>My Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitenew/1.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:remove>
- <D:href>mailto:user02 at example.com</D:href>
+ <D:href>$cuaddr2:</D:href>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read-write/>
</CS:remove>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/1.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:set>
- <D:href>mailto:user02 at example.com</D:href>
+ <D:href>$cuaddr2:</D:href>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read/>
</CS:set>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/updatenew/2.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -2,16 +2,16 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-noresponse/>
<access>
<read/>
</access>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<organizer>
- <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+ <href xmlns='DAV:'>$principaluri1:</href>
<common-name>User 01</common-name>
</organizer>
<summary>My Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/1.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:set>
- <D:href>mailto:user02 at example.com</D:href>
+ <D:href>$cuaddr2:</D:href>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read-write/>
</CS:set>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -2,16 +2,16 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-noresponse/>
<access>
<read-write/>
</access>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<organizer>
- <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+ <href xmlns='DAV:'>$principaluri1:</href>
<common-name>User 01</common-name>
</organizer>
<summary>My Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-properties/read-write/3.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-accepted/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/1.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:set>
- <D:href>mailto:user02 at example.com</D:href>
+ <D:href>$cuaddr2:</D:href>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read-write/>
</CS:set>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/2.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -2,16 +2,16 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-noresponse/>
<access>
<read-write/>
</access>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<organizer>
- <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+ <href xmlns='DAV:'>$principaluri1:</href>
<common-name>User 01</common-name>
</organizer>
<summary>My Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/3.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-accepted/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/5.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
<response>
- <href>/calendars/__uids__/user01/shared/</href>
+ <href>$pathprefix1:/shared/</href>
<propstat>
<prop>
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/6.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-accepted/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/1.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-declined/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/3.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
<response>
- <href>/calendars/__uids__/user01/shared/</href>
+ <href>$pathprefix1:/shared/</href>
<propstat>
<prop>
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/decline/4.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-declined/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
</invite-reply>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/1.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/1.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:set>
- <D:href>mailto:user02 at example.com</D:href>
+ <D:href>$cuaddr2:</D:href>
<CS:common-name>Display Name 02</CS:common-name>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read-write/>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/2.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/2.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -2,16 +2,16 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-noresponse/>
<access>
<read-write/>
</access>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<organizer>
- <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+ <href xmlns='DAV:'>$principaluri1:</href>
<common-name>User 01</common-name>
</organizer>
<summary>My Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-accepted/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/5.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/5.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
<response>
- <href>/calendars/__uids__/user01/shared/</href>
+ <href>$pathprefix1:/shared/</href>
<propstat>
<prop>
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-accepted/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/Common/POST/sharinginvite23.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
<CS:set>
- <D:href>mailto:user02 at example.com</D:href>
+ <D:href>$cuaddr2:</D:href>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read-write/>
</CS:set>
<CS:set>
- <D:href>mailto:user03 at example.com</D:href>
+ <D:href>$cuaddr3:</D:href>
<CS:summary>My Shared Calendar</CS:summary>
<CS:read/>
</CS:set>
Modified: CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply2.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <href xmlns='DAV:'>$principaluri2:</href>
<invite-accepted/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid2:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply3.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
- <href xmlns='DAV:'>/principals/__uids__/user03/</href>
+ <href xmlns='DAV:'>$principalur3:</href>
<invite-accepted/>
<hosturl>
- <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
</hosturl>
<in-reply-to>$inviteuid3:</in-reply-to>
<summary>The Shared Calendar</summary>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -359,7 +359,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>DAV:principal-collection-set$<href>/principals/</href></value>
+ <value>DAV:principal-collection-set$<href>$principalcollection:</href></value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -105,6 +105,12 @@
</test>
</test-suite>
- <end/>
+ <end>
+ <request>
+ <method>DELETE</method>
+ <ruri>$pathprefix1:/caltest-moved/</ruri>
+ </request>
+ </end>
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -126,7 +126,7 @@
<arg>
<name>props</name>
<value>DAV:resourcetype$.*shared[^-].*</value>
- <value><![CDATA[DAV:owner$<href>/principals/__uids__/user01/</href>]]></value>
+ <value><![CDATA[DAV:owner$<href>$principaluri1:</href>]]></value>
<value><![CDATA[DAV:current-user-privilege-set$.*<read/>.*]]></value>
<value><![CDATA[DAV:current-user-privilege-set$.*<write/>.*]]></value>
<value><![CDATA[DAV:current-user-privilege-set$.*<bind/>.*]]></value>
@@ -329,7 +329,7 @@
<arg>
<name>props</name>
<value>DAV:resourcetype$.*shared[^-].*</value>
- <value><![CDATA[DAV:owner$<href>/principals/__uids__/user01/</href>]]></value>
+ <value><![CDATA[DAV:owner$<href>$principaluri1:</href>]]></value>
<value><![CDATA[DAV:current-user-privilege-set$.*<read/>.*]]></value>
<value><![CDATA[DAV:current-user-privilege-set!.*<write/>.*]]></value>
<value><![CDATA[DAV:current-user-privilege-set!.*<bind/>.*]]></value>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -126,7 +126,7 @@
<arg>
<name>props</name>
<value>DAV:resourcetype$.*shared[^-].*</value>
- <value><![CDATA[DAV:owner$<href>/principals/__uids__/user01/</href>]]></value>
+ <value><![CDATA[DAV:owner$<href>$principaluri1:</href>]]></value>
<value><![CDATA[DAV:current-user-privilege-set$.*<read/>.*]]></value>
<value><![CDATA[DAV:current-user-privilege-set$.*<write/>.*]]></value>
<value><![CDATA[DAV:current-user-privilege-set$.*<bind/>.*]]></value>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -421,8 +421,8 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>/principals/__uids__/public01/</value>
- <value>/principals/__uids__/user01/</value>
+ <value>$publicprincipaluri1:</value>
+ <value>$principaluri1:</value>
</arg>
</verify>
</request>
@@ -444,8 +444,8 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>/principals/__uids__/public02/</value>
- <value>/principals/__uids__/user02/</value>
+ <value>$publicprincipaluri2:</value>
+ <value>$principaluri2:</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/resourceid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/resourceid.xml 2010-05-13 14:12:06 UTC (rev 5596)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/resourceid.xml 2010-05-13 15:32:43 UTC (rev 5597)
@@ -109,6 +109,11 @@
</test>
</test-suite>
- <end/>
+ <end>
+ <request>
+ <method>DELETE</method>
+ <ruri>$addressbookhome1:/adbktest-moved/</ruri>
+ </request>
+ </end>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100513/60f5704f/attachment-0001.html>
More information about the calendarserver-changes
mailing list