[CalendarServer-changes] [1747] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Aug 1 11:03:34 PDT 2007
Revision: 1747
http://trac.macosforge.org/projects/calendarserver/changeset/1747
Author: cdaboo at apple.com
Date: 2007-08-01 11:03:32 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Merge of branches/users/cdaboo/new-principal-uri-1727 to trunk.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/acldisabled/1.xml
CalDAVTester/trunk/Resource/aclreports/9.xml
CalDAVTester/trunk/Resource/acls/13.xml
CalDAVTester/trunk/Resource/acls/20.xml
CalDAVTester/trunk/Resource/acls/21.xml
CalDAVTester/trunk/Resource/acls/3.xml
CalDAVTester/trunk/Resource/acls/4.xml
CalDAVTester/trunk/Resource/acls/7.xml
CalDAVTester/trunk/Resource/acls/8.xml
CalDAVTester/trunk/Resource/calendaruserproxy/9.ics
CalDAVTester/trunk/Resource/depthreportsacl/1.xml
CalDAVTester/trunk/Resource/depthreportsacl/2.xml
CalDAVTester/trunk/Resource/depthreportsacl/3.xml
CalDAVTester/trunk/Resource/dropbox/3.xml
CalDAVTester/trunk/Resource/dropbox/7.xml
CalDAVTester/trunk/Resource/schedule/19.ics
CalDAVTester/trunk/Resource/scheduleauto/1.ics
CalDAVTester/trunk/Resource/scheduleauto/10.ics
CalDAVTester/trunk/Resource/scheduleauto/11.ics
CalDAVTester/trunk/Resource/scheduleauto/12.ics
CalDAVTester/trunk/Resource/scheduleauto/13.ics
CalDAVTester/trunk/Resource/scheduleauto/14.ics
CalDAVTester/trunk/Resource/scheduleauto/15.ics
CalDAVTester/trunk/Resource/scheduleauto/16.ics
CalDAVTester/trunk/Resource/scheduleauto/17.ics
CalDAVTester/trunk/Resource/scheduleauto/18.ics
CalDAVTester/trunk/Resource/scheduleauto/19.ics
CalDAVTester/trunk/Resource/scheduleauto/2.ics
CalDAVTester/trunk/Resource/scheduleauto/20.ics
CalDAVTester/trunk/Resource/scheduleauto/3.ics
CalDAVTester/trunk/Resource/scheduleauto/4.ics
CalDAVTester/trunk/Resource/scheduleauto/5.ics
CalDAVTester/trunk/Resource/scheduleauto/7.ics
CalDAVTester/trunk/Resource/scheduleauto/8.ics
CalDAVTester/trunk/Resource/scheduleauto/9.ics
CalDAVTester/trunk/Resource/schedulenormal/1.ics
CalDAVTester/trunk/Resource/schedulenormal/4.ics
CalDAVTester/trunk/buildperformance/get/get-principal.xml
CalDAVTester/trunk/monitor/get/get-principal.xml
CalDAVTester/trunk/performance/principal-match/matchself.xml
CalDAVTester/trunk/performance/propfind/propfind-large.xml
CalDAVTester/trunk/performance/put/put-end.xml
CalDAVTester/trunk/performance/put/put-large.xml
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/buildperformance/get-large.xml
CalDAVTester/trunk/scripts/buildperformance/get-small.xml
CalDAVTester/trunk/scripts/buildperformance/poll-nothing-new.xml
CalDAVTester/trunk/scripts/buildperformance/poll-one-new.xml
CalDAVTester/trunk/scripts/buildperformance/poll-ten-new.xml
CalDAVTester/trunk/scripts/buildperformance/put-large.xml
CalDAVTester/trunk/scripts/buildperformance/put-small.xml
CalDAVTester/trunk/scripts/performance/perfinfo-get-large-load.xml
CalDAVTester/trunk/scripts/performance/perfinfo-get-large.xml
CalDAVTester/trunk/scripts/performance/perfinfo-get-medium.xml
CalDAVTester/trunk/scripts/performance/perfinfo-get-small-load.xml
CalDAVTester/trunk/scripts/performance/perfinfo-get-small.xml
CalDAVTester/trunk/scripts/performance/perfinfo-propfind-large.xml
CalDAVTester/trunk/scripts/performance/perfinfo-propfind-load.xml
CalDAVTester/trunk/scripts/performance/perfinfo-propfind-small.xml
CalDAVTester/trunk/scripts/performance/perfinfo-put-large.xml
CalDAVTester/trunk/scripts/performance/perfinfo.xml
CalDAVTester/trunk/scripts/server/serverinfo-monitor.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/server/sslserverinfo.xml
CalDAVTester/trunk/scripts/tests/acl.xml
CalDAVTester/trunk/scripts/tests/aclreports.xml
CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
CalDAVTester/trunk/scripts/tests/dropbox.xml
CalDAVTester/trunk/scripts/tests/schedulepost.xml
CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
CalDAVTester/trunk/scripts/tests/scheduleprops.xml
Modified: CalDAVTester/trunk/Resource/acldisabled/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/acldisabled/1.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/acldisabled/1.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal2:</D:href>
+ <D:href>$principaluri2:</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read/></D:privilege>
Modified: CalDAVTester/trunk/Resource/aclreports/9.xml
===================================================================
--- CalDAVTester/trunk/Resource/aclreports/9.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/aclreports/9.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:propertyupdate xmlns:D="DAV:">
<D:set>
<D:prop>
-<D:whoami><D:href>$principal:</D:href></D:whoami>
+<D:whoami><D:href>$principal1:</D:href></D:whoami>
</D:prop>
</D:set>
</D:propertyupdate>
Modified: CalDAVTester/trunk/Resource/acls/13.xml
===================================================================
--- CalDAVTester/trunk/Resource/acls/13.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/acls/13.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal3:</D:href>
+ <D:href>$principaluri3:</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read/></D:privilege>
@@ -10,7 +10,7 @@
</D:ace>
<D:ace>
<D:principal>
- <D:href>$principal:</D:href>
+ <D:href>$principaluri1:</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read/></D:privilege>
Modified: CalDAVTester/trunk/Resource/acls/20.xml
===================================================================
--- CalDAVTester/trunk/Resource/acls/20.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/acls/20.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal:</D:href>
+ <D:href>$principaluri1:</D:href>
</D:principal>
<D:deny>
<D:privilege><D:read/></D:privilege>
Modified: CalDAVTester/trunk/Resource/acls/21.xml
===================================================================
--- CalDAVTester/trunk/Resource/acls/21.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/acls/21.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal:</D:href>
+ <D:href>$principaluri1:</D:href>
</D:principal>
<D:deny>
<D:privilege><D:read/></D:privilege>
Modified: CalDAVTester/trunk/Resource/acls/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/acls/3.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/acls/3.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal:</D:href>
+ <D:href>$principaluri1:</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read/></D:privilege>
Modified: CalDAVTester/trunk/Resource/acls/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/acls/4.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/acls/4.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal3:</D:href>
+ <D:href>$principaluri3:</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read/></D:privilege>
@@ -10,7 +10,7 @@
</D:ace>
<D:ace>
<D:principal>
- <D:href>$principal:</D:href>
+ <D:href>$principaluri1:</D:href>
</D:principal>
<D:deny>
<D:privilege><D:read/></D:privilege>
Modified: CalDAVTester/trunk/Resource/acls/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/acls/7.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/acls/7.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principaladmin:</D:href>
+ <D:href>$principaluriadmin:</D:href>
</D:principal>
<D:deny>
<D:privilege><D:write-acl/></D:privilege>
Modified: CalDAVTester/trunk/Resource/acls/8.xml
===================================================================
--- CalDAVTester/trunk/Resource/acls/8.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/acls/8.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal:</D:href>
+ <D:href>$principaluri1:</D:href>
</D:principal>
<D:deny>
<D:privilege><D:write-acl/></D:privilege>
Modified: CalDAVTester/trunk/Resource/calendaruserproxy/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/calendaruserproxy/9.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/calendaruserproxy/9.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -28,8 +28,8 @@
DURATION:PT1H
SUMMARY:event 1
UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=User 01:$cuaddralt1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/depthreportsacl/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/depthreportsacl/1.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/depthreportsacl/1.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal2:</D:href>
+ <D:href>$principaluri2:</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read/></D:privilege>
@@ -10,7 +10,7 @@
</D:ace>
<D:ace>
<D:principal>
- <D:href>$principal2:</D:href>
+ <D:href>$principaluri2:</D:href>
</D:principal>
<D:deny>
<D:privilege><D:all/></D:privilege>
Modified: CalDAVTester/trunk/Resource/depthreportsacl/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/depthreportsacl/2.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/depthreportsacl/2.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal2:</D:href>
+ <D:href>$principaluri2:</D:href>
</D:principal>
<D:deny>
<D:privilege><D:all/></D:privilege>
Modified: CalDAVTester/trunk/Resource/depthreportsacl/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/depthreportsacl/3.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/depthreportsacl/3.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:ace>
<D:principal>
- <D:href>$principal2:</D:href>
+ <D:href>$principaluri2:</D:href>
</D:principal>
<D:grant>
<D:privilege><C:read-free-busy/></D:privilege>
@@ -10,7 +10,7 @@
</D:ace>
<D:ace>
<D:principal>
- <D:href>$principal2:</D:href>
+ <D:href>$principaluri2:</D:href>
</D:principal>
<D:deny>
<D:privilege><D:all/></D:privilege>
Modified: CalDAVTester/trunk/Resource/dropbox/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/dropbox/3.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/dropbox/3.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal2:</D:href>
+ <D:href>$principaluri2:</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read/></D:privilege>
Modified: CalDAVTester/trunk/Resource/dropbox/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/dropbox/7.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/dropbox/7.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -2,7 +2,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>$principal2:</D:href>
+ <D:href>$principaluri2:</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read/></D:privilege>
Modified: CalDAVTester/trunk/Resource/schedule/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedule/19.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/schedule/19.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -5,8 +5,8 @@
METHOD:REQUEST
BEGIN:VFREEBUSY
UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$principalnoslash:
-ATTENDEE;CN=User 02:$principal2noslash:
+ORGANIZER;CN=User 01:$cuaddraltnoslash1:
+ATTENDEE;CN=User 02:$cuaddraltnoslash2:
DTSTART:20060101T000000Z
DTSTAMP:20060309T185105Z
DTEND:20060102T000000Z
Modified: CalDAVTester/trunk/Resource/scheduleauto/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/1.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/1.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,12 +6,12 @@
UID:20060110T231240Z-4011c71-187-6f73-1
DTSTART:20060208T200000Z
DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
STATUS:CONFIRMED
SUMMARY:TC Realtime
TRANSP:OPAQUE
Modified: CalDAVTester/trunk/Resource/scheduleauto/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/10.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/10.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,11 +6,11 @@
UID:20060110T231240Z-4011c71-187-6f73-3
DTSTART:20060206T200000Z
DTEND:20060206T210000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rprincipal1:
+ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
REQUEST-STATUS:4.0\; Event conflict. Date/time is busy.
RRULE:FREQ=DAILY;COUNT=5
STATUS:CONFIRMED
Modified: CalDAVTester/trunk/Resource/scheduleauto/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/11.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/11.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,12 +6,12 @@
UID:20060110T231240Z-4011c71-187-6f73-4
DTSTART:20060206T100000Z
DTEND:20060206T110000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
RRULE:FREQ=DAILY;COUNT=5
STATUS:CONFIRMED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/scheduleauto/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/12.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/12.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -5,12 +5,12 @@
UID:20060110T231240Z-4011c71-187-6f73-4
DTSTART:20060206T100000Z
DTEND:20060206T110000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
RRULE:FREQ=DAILY;COUNT=5
STATUS:CONFIRMED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/scheduleauto/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/13.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/13.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,11 +6,11 @@
UID:20060110T231240Z-4011c71-187-6f73-4
DTSTART:20060206T100000Z
DTEND:20060206T110000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rprincipal1:
+ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
REQUEST-STATUS:2.0\; Success.
RRULE:FREQ=DAILY;COUNT=5
STATUS:CONFIRMED
Modified: CalDAVTester/trunk/Resource/scheduleauto/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/14.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/14.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,12 +6,12 @@
UID:20060110T231240Z-4011c71-187-6f73-5
DTSTART:20060210T104500Z
DTEND:20060210T114500Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
STATUS:CONFIRMED
SUMMARY:TC Realtime
TRANSP:OPAQUE
Modified: CalDAVTester/trunk/Resource/scheduleauto/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/15.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/15.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,11 +6,11 @@
UID:20060110T231240Z-4011c71-187-6f73-5
DTSTART:20060210T104500Z
DTEND:20060210T114500Z
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rprincipal1:
+ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
REQUEST-STATUS:4.0\; Event conflict. Date/time is busy.
STATUS:CONFIRMED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/scheduleauto/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/16.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/16.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,12 +6,12 @@
UID:20060110T231240Z-4011c71-187-6f73-6
DTSTART:20060210T080000Z
DTEND:20060210T081000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
RRULE:FREQ=HOURLY;COUNT=8
STATUS:CONFIRMED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/scheduleauto/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/17.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/17.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,11 +6,11 @@
UID:20060110T231240Z-4011c71-187-6f73-6
DTSTART:20060210T080000Z
DTEND:20060210T081000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rprincipal1:
+ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
REQUEST-STATUS:4.0\; Event conflict. Date/time is busy.
RRULE:FREQ=HOURLY;COUNT=8
STATUS:CONFIRMED
Modified: CalDAVTester/trunk/Resource/scheduleauto/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/18.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/18.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,12 +6,12 @@
UID:20060110T231240Z-4011c71-187-6f73-1
DTSTART:20060208T200000Z
DTEND:20060208T210000Z
-ATTENDEE;CN=User 02:$principal2:
-ATTENDEE;CN=Resource 01:$rprincipal1:
+ATTENDEE;CN=User 02:$cuaddralt2:
+ATTENDEE;CN=Resource 01:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
SEQUENCE:2
STATUS:CANCELLED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/scheduleauto/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/19.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/19.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,12 +6,12 @@
UID:20060110T231240Z-4011c71-187-6f73-19
DTSTART:20060308T200000Z
DTEND:20060308T210000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
STATUS:CONFIRMED
SUMMARY:TC Realtime
TRANSP:OPAQUE
Modified: CalDAVTester/trunk/Resource/scheduleauto/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/2.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/2.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -5,12 +5,12 @@
UID:20060110T231240Z-4011c71-187-6f73-1
DTSTART:20060208T200000Z
DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
STATUS:CONFIRMED
SUMMARY:TC Realtime
TRANSP:OPAQUE
Modified: CalDAVTester/trunk/Resource/scheduleauto/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/20.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/20.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -5,12 +5,12 @@
UID:20060110T231240Z-4011c71-187-6f73-19
DTSTART:20060308T200000Z
DTEND:20060308T210000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
STATUS:CONFIRMED
SUMMARY:TC Realtime
TRANSP:OPAQUE
Modified: CalDAVTester/trunk/Resource/scheduleauto/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/3.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/3.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,11 +6,11 @@
UID:20060110T231240Z-4011c71-187-6f73-1
DTSTART:20060208T200000Z
DTEND:20060208T210000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rprincipal1:
+ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
REQUEST-STATUS:2.0\; Success.
STATUS:CONFIRMED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/scheduleauto/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/4.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/4.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,12 +6,12 @@
UID:20060110T231240Z-4011c71-187-6f73-1
DTSTART:20060208T200000Z
DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$principal2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rprincipal1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
SEQUENCE:1
STATUS:CONFIRMED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/scheduleauto/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/5.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/5.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -5,12 +5,12 @@
UID:20060110T231240Z-4011c71-187-6f73-1
DTSTART:20060208T200000Z
DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$principal2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rprincipal1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
SEQUENCE:1
STATUS:CONFIRMED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/scheduleauto/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/7.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/7.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,12 +6,12 @@
UID:20060110T231240Z-4011c71-187-6f73-2
DTSTART:20060208T203000Z
DTEND:20060208T213000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
STATUS:CONFIRMED
SUMMARY:TC Realtime
TRANSP:OPAQUE
Modified: CalDAVTester/trunk/Resource/scheduleauto/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/8.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/8.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,11 +6,11 @@
UID:20060110T231240Z-4011c71-187-6f73-2
DTSTART:20060208T203000Z
DTEND:20060208T213000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rprincipal1:
+ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
REQUEST-STATUS:4.0\; Event conflict. Date/time is busy.
STATUS:CONFIRMED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/scheduleauto/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/9.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/scheduleauto/9.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -6,12 +6,12 @@
UID:20060110T231240Z-4011c71-187-6f73-3
DTSTART:20060206T200000Z
DTEND:20060206T210000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rprincipal1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Cyrus Daboo:$principal:
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
RRULE:FREQ=DAILY;COUNT=5
STATUS:CONFIRMED
SUMMARY:TC Realtime
Modified: CalDAVTester/trunk/Resource/schedulenormal/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulenormal/1.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/schedulenormal/1.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -28,8 +28,8 @@
DURATION:PT1H
SUMMARY:event 1
UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=User 01:$cuaddralt1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/schedulenormal/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulenormal/4.ics 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/Resource/schedulenormal/4.ics 2007-08-01 18:03:32 UTC (rev 1747)
@@ -28,7 +28,7 @@
DURATION:PT1H
SUMMARY:event 1
UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$principal2:
+ORGANIZER;CN=User 01:$cuaddralt1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/buildperformance/get/get-principal.xml
===================================================================
--- CalDAVTester/trunk/buildperformance/get/get-principal.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/buildperformance/get/get-principal.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -30,7 +30,7 @@
<description>GET on principal collection</description>
<request>
<method>GET</method>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/trunk/monitor/get/get-principal.xml
===================================================================
--- CalDAVTester/trunk/monitor/get/get-principal.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/monitor/get/get-principal.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -30,7 +30,7 @@
<description>GET on principal resource</description>
<request>
<method>GET</method>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/trunk/performance/principal-match/matchself.xml
===================================================================
--- CalDAVTester/trunk/performance/principal-match/matchself.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/performance/principal-match/matchself.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -43,7 +43,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/performance/propfind/propfind-large.xml
===================================================================
--- CalDAVTester/trunk/performance/propfind/propfind-large.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/performance/propfind/propfind-large.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -24,7 +24,7 @@
<start/>
<test-suite name='regular prop finds' ignore='no'>
- <test name='1' count='1' stats='yes' ignore='no'>
+ <test name='1' count='10' stats='yes' ignore='no'>
<description>PROPFIND of basic properties on calendar with 1000 items</description>
<request>
<method>PROPFIND</method>
Modified: CalDAVTester/trunk/performance/put/put-end.xml
===================================================================
--- CalDAVTester/trunk/performance/put/put-end.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/performance/put/put-end.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -26,6 +26,10 @@
<start>
<request>
<method>DELETE</method>
+ <ruri>1.ics</ruri>
+ </request>
+ <request>
+ <method>DELETE</method>
<ruri>3.ics</ruri>
</request>
</start>
Modified: CalDAVTester/trunk/performance/put/put-large.xml
===================================================================
--- CalDAVTester/trunk/performance/put/put-large.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/performance/put/put-large.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -27,7 +27,7 @@
<start/>
<test-suite name='Plain PUT - no recurrence' ignore='no'>
- <test name='1' count='1' stats='yes'>
+ <test name='1' count='10' stats='yes'>
<description>PUT to calendar collection</description>
<request>
<method>PUT</method>
Modified: CalDAVTester/trunk/performance/schedule-freebusy/schedule-small.xml
===================================================================
--- CalDAVTester/trunk/performance/schedule-freebusy/schedule-small.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/performance/schedule-freebusy/schedule-small.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -56,7 +56,7 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</header>
<header>
<name>Recipient</name>
Modified: CalDAVTester/trunk/performance/schedule-freebusy/schedule-tests.xml
===================================================================
--- CalDAVTester/trunk/performance/schedule-freebusy/schedule-tests.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/performance/schedule-freebusy/schedule-tests.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -55,7 +55,7 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</header>
<header>
<name>Recipient</name>
@@ -77,11 +77,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $principal3:, /principals/user/user04, /principals/user/user05, /principals/user/user06, /principals/user/user07, /principals/user/user08, /principals/user/user09, /principals/user/user10, /principals/user/user11</value>
+ <value>$principal2:, $principal3:, $principals:user04, $principals:user05, $principals:user06, $principals:user07, $principals:user08, $principals:user09, $principals:user10, $principals:user11</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -99,11 +99,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $principal3:, /principals/user/user04, /principals/user/user05, /principals/user/user06, /principals/user/user07, /principals/user/user08, /principals/user/user09, /principals/user/user10, /principals/user/user11, /principals/user/user12, /principals/user/user13, /principals/user/user14, /principals/user/user15, /principals/user/user16, /principals/user/user17, /principals/user/user18, /principals/user/user19, /principals/user/user20, /principals/user/user21, /principals/user/user22, /principals/user/user23, /principals/user/user24, /principals/user/user25, /principals/user/user26, /principals/user/user27, /principals/user/user28, /principals/user/user29, /principals/user/user30, /principals/user/user31, /principals/user/user32, /principals/user/user33, /principals/user/user34, /principals/user/user35, /principals/user/user36, /principals/user/user37, /principals/user/user38, /principals/user/user39, /principals/user/user40, /principals/user/user41,
/principals/user/user42, /principals/user/user43, /principals/user/user44, /principals/user/user45, /principals/user/user46, /principals/user/user47, /principals/user/user48, /principals/user/user49, /principals/user/user50, /principals/user/user51, /principals/user/user52, /principals/user/user53, /principals/user/user54, /principals/user/user55, /principals/user/user56, /principals/user/user57, /principals/user/user58, /principals/user/user59, /principals/user/user60, /principals/user/user61, /principals/user/user62, /principals/user/user63, /principals/user/user64, /principals/user/user65, /principals/user/user66, /principals/user/user67, /principals/user/user68, /principals/user/user69, /principals/user/user70, /principals/user/user71, /principals/user/user72, /principals/user/user73, /principals/user/user74, /principals/user/user75, /principals/user/user76, /principals/user/user77, /principals/user/user78, /principals/user/user79, /principals/user/user80, /principals/u
ser/user81, /principals/user/user82, /principals/user/user83, /principals/user/user84, /principals/user/user85, /principals/user/user86, /principals/user/user87, /principals/user/user88, /principals/user/user89, /principals/user/user90, /principals/user/user91, /principals/user/user92, /principals/user/user93, /principals/user/user94, /principals/user/user95, /principals/user/user96, /principals/user/user97, /principals/user/user98, /principals/user/user99</value>
+ <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>$pathprefix:/outbox/</ruri>
<data>
Modified: CalDAVTester/trunk/performance/schedule-invite/schedule-small.xml
===================================================================
--- CalDAVTester/trunk/performance/schedule-invite/schedule-small.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/performance/schedule-invite/schedule-small.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -56,7 +56,7 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</header>
<header>
<name>Recipient</name>
Modified: CalDAVTester/trunk/performance/schedule-invite/schedule-tests.xml
===================================================================
--- CalDAVTester/trunk/performance/schedule-invite/schedule-tests.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/performance/schedule-invite/schedule-tests.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -56,7 +56,7 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</header>
<header>
<name>Recipient</name>
@@ -85,7 +85,7 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</header>
<header>
<name>Recipient</name>
@@ -114,7 +114,7 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</header>
<header>
<name>Recipient</name>
Modified: CalDAVTester/trunk/scripts/buildperformance/get-large.xml
===================================================================
--- CalDAVTester/trunk/scripts/buildperformance/get-large.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/buildperformance/get-large.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -47,7 +47,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user%02d/</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/buildperformance/get-small.xml
===================================================================
--- CalDAVTester/trunk/scripts/buildperformance/get-small.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/buildperformance/get-small.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -47,7 +47,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user%02d/</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/buildperformance/poll-nothing-new.xml
===================================================================
--- CalDAVTester/trunk/scripts/buildperformance/poll-nothing-new.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/buildperformance/poll-nothing-new.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -48,7 +48,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user%02d/</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/buildperformance/poll-one-new.xml
===================================================================
--- CalDAVTester/trunk/scripts/buildperformance/poll-one-new.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/buildperformance/poll-one-new.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -48,7 +48,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user%02d/</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/buildperformance/poll-ten-new.xml
===================================================================
--- CalDAVTester/trunk/scripts/buildperformance/poll-ten-new.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/buildperformance/poll-ten-new.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -48,7 +48,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user%02d/</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/buildperformance/put-large.xml
===================================================================
--- CalDAVTester/trunk/scripts/buildperformance/put-large.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/buildperformance/put-large.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -47,7 +47,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user%02d/</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/buildperformance/put-small.xml
===================================================================
--- CalDAVTester/trunk/scripts/buildperformance/put-small.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/buildperformance/put-small.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -47,7 +47,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user%02d/</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo-get-large-load.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo-get-large-load.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo-get-large-load.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -108,7 +108,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/user/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo-get-large.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo-get-large.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo-get-large.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -75,7 +75,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/user/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo-get-medium.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo-get-medium.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo-get-medium.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -75,7 +75,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/user/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo-get-small-load.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo-get-small-load.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo-get-small-load.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -108,7 +108,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/user/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo-get-small.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo-get-small.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo-get-small.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -75,7 +75,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/user/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo-propfind-large.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo-propfind-large.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo-propfind-large.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -75,7 +75,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/user/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo-propfind-load.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo-propfind-load.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo-propfind-load.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -47,7 +47,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/user/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo-propfind-small.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo-propfind-small.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo-propfind-small.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -75,7 +75,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/user/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo-put-large.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo-put-large.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo-put-large.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -75,7 +75,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/user/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/performance/perfinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/performance/perfinfo.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/performance/perfinfo.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -75,7 +75,7 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user%02d</value>
</substitution>
<!-- relative path to first user calendar home-->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-monitor.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-monitor.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/server/serverinfo-monitor.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -23,6 +23,7 @@
<serverinfo>
<host>localhost</host>
<port>8008</port>
+ <authtype>basic</authtype>
<substitutions>
<substitution>
<key>$host:</key>
@@ -35,12 +36,54 @@
<value>/principals/users/</value>
</substitution>
+ <!-- relative path to group principal collection-->
+ <substitution>
+ <key>$groups:</key>
+ <value>/principals/groups/</value>
+ </substitution>
+
<!-- relative path to resource principal collection-->
<substitution>
<key>$resources:</key>
<value>/principals/resources/</value>
</substitution>
+ <!-- relative path to location principal collection-->
+ <substitution>
+ <key>$locations:</key>
+ <value>/principals/locations/</value>
+ </substitution>
+
+ <!-- relative path to __uids__ principal collection-->
+ <substitution>
+ <key>$uids:</key>
+ <value>/principals/locations/</value>
+ </substitution>
+
+ <!-- relative path to calendars collection-->
+ <substitution>
+ <key>$calendars:</key>
+ <value>/calendars/</value>
+ </substitution>
+
+ <!-- relative path to user calendars collection-->
+ <substitution>
+ <key>$usercalendars:</key>
+ <value>/calendars/users/</value>
+ </substitution>
+
+ <!-- inbox name-->
+ <substitution>
+ <key>$inbox:</key>
+ <value>inbox</value>
+ </substitution>
+
+ <!-- outbox name-->
+ <substitution>
+ <key>$outbox:</key>
+ <value>outbox</value>
+ </substitution>
+
<!-- user id for admin user -->
<substitution>
<key>$useradmin:</key>
@@ -51,17 +94,27 @@
<key>$pswdadmin:</key>
<value>admin</value>
</substitution>
+
<!-- relative path to admin principal resource-->
<substitution>
<key>$principaladmin:</key>
<value>/principals/users/admin/</value>
</substitution>
+ <substitution>
+ <key>$principaluriadmin:</key>
+ <value>/principals/__uids__/admin/</value>
+ </substitution>
- <!-- relative path to principal collection-->
+ <!-- user id for proxy user -->
<substitution>
- <key>$principals:</key>
- <value>/principals/users/</value>
+ <key>$userproxy:</key>
+ <value>superuser</value>
</substitution>
+ <!-- password for proxy user -->
+ <substitution>
+ <key>$pswdproxy:</key>
+ <value>superuser</value>
+ </substitution>
<!-- relative path to first user principal resource-->
<substitution>
@@ -75,9 +128,17 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user01/</value>
</substitution>
+ <substitution>
+ <key>$principaluri1:</key>
+ <value>/principals/__uids__/user01/</value>
+ </substitution>
+ <substitution>
+ <key>$principalnoslash:</key>
+ <value>/principals/users/user01</value>
+ </substitution>
<!-- relative path to first user calendar home-->
<substitution>
<key>$pathprefix:</key>
@@ -93,6 +154,15 @@
<key>$cuaddr1:</key>
<value>mailto:user01 at example.com</value>
</substitution>
+ <substitution>
+ <key>$cuaddralt1:</key>
+ <value>/principals/__uids__/user01/</value>
+ </substitution>
+ <substitution>
+ <key>$cuaddraltnoslash1:</key>
+ <value>/principals/__uids__/user01</value>
+ </substitution>
+
</substitutions>
<serverfilepath/>
</serverinfo>
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -54,6 +54,12 @@
<value>/principals/locations/</value>
</substitution>
+ <!-- relative path to __uids__ principal collection-->
+ <substitution>
+ <key>$uids:</key>
+ <value>/principals/locations/</value>
+ </substitution>
+
<!-- relative path to calendars collection-->
<substitution>
<key>$calendars:</key>
@@ -88,16 +94,15 @@
<key>$pswdadmin:</key>
<value>admin</value>
</substitution>
+
<!-- relative path to admin principal resource-->
<substitution>
<key>$principaladmin:</key>
<value>/principals/users/admin/</value>
</substitution>
-
- <!-- relative path to principal collection-->
<substitution>
- <key>$principals:</key>
- <value>/principals/users/</value>
+ <key>$principaluriadmin:</key>
+ <value>/principals/__uids__/admin/</value>
</substitution>
<!-- user id for proxy user -->
@@ -123,10 +128,14 @@
</substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
<value>/principals/users/user01/</value>
</substitution>
<substitution>
+ <key>$principaluri1:</key>
+ <value>/principals/__uids__/user01/</value>
+ </substitution>
+ <substitution>
<key>$principalnoslash:</key>
<value>/principals/users/user01</value>
</substitution>
@@ -145,6 +154,14 @@
<key>$cuaddr1:</key>
<value>mailto:user01 at example.com</value>
</substitution>
+ <substitution>
+ <key>$cuaddralt1:</key>
+ <value>/principals/__uids__/user01/</value>
+ </substitution>
+ <substitution>
+ <key>$cuaddraltnoslash1:</key>
+ <value>/principals/__uids__/user01</value>
+ </substitution>
<!-- user id for second user -->
<substitution>
@@ -162,6 +179,10 @@
<value>/principals/users/user02/</value>
</substitution>
<substitution>
+ <key>$principaluri2:</key>
+ <value>/principals/__uids__/user02/</value>
+ </substitution>
+ <substitution>
<key>$principal2noslash:</key>
<value>/principals/users/user02</value>
</substitution>
@@ -175,6 +196,14 @@
<key>$cuaddr2:</key>
<value>mailto:user02 at example.com</value>
</substitution>
+ <substitution>
+ <key>$cuaddralt2:</key>
+ <value>/principals/__uids__/user02/</value>
+ </substitution>
+ <substitution>
+ <key>$cuaddraltnoslash2:</key>
+ <value>/principals/__uids__/user02</value>
+ </substitution>
<!-- user id for third user -->
<substitution>
@@ -191,6 +220,10 @@
<key>$principal3:</key>
<value>/principals/users/user03/</value>
</substitution>
+ <substitution>
+ <key>$principaluri3:</key>
+ <value>/principals/__uids__/user03/</value>
+ </substitution>
<!-- relative path to third user calendar home-->
<substitution>
<key>$pathprefix3:</key>
@@ -201,6 +234,10 @@
<key>$cuaddr3:</key>
<value>mailto:user03 at example.com</value>
</substitution>
+ <substitution>
+ <key>$cuaddralt3:</key>
+ <value>/principals/__uids__/user03/</value>
+ </substitution>
<!-- relative path to first resource calendar home-->
<substitution>
@@ -212,6 +249,14 @@
<key>$rprincipal1:</key>
<value>/principals/resources/resource01/</value>
</substitution>
+ <substitution>
+ <key>$rprincipaluri1:</key>
+ <value>/principals/__uids__/resource01/</value>
+ </substitution>
+ <substitution>
+ <key>$rcuaddralt1:</key>
+ <value>/principals/__uids__/resource01/</value>
+ </substitution>
</substitutions>
<serverfilepath>/Users/cyrusdaboo/Documents/Development/Apple/eclipse/CalendarServer/twistedcaldav/test/data/</serverfilepath>
</serverinfo>
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -23,16 +23,68 @@
<serverinfo>
<host>localhost</host>
<port>8443</port>
+ <authtype>basic</authtype>
<ssl/>
- <calendarpath>/calendars/users/user01/calendar</calendarpath>
- <user>user01</user>
- <pswd>user01</pswd>
<substitutions>
<substitution>
<key>$host:</key>
<value>https://localhost:8443</value>
</substitution>
+ <!-- relative path to principal collection-->
+ <substitution>
+ <key>$principals:</key>
+ <value>/principals/users/</value>
+ </substitution>
+
+ <!-- relative path to group principal collection-->
+ <substitution>
+ <key>$groups:</key>
+ <value>/principals/groups/</value>
+ </substitution>
+
+ <!-- relative path to resource principal collection-->
+ <substitution>
+ <key>$resources:</key>
+ <value>/principals/resources/</value>
+ </substitution>
+
+ <!-- relative path to location principal collection-->
+ <substitution>
+ <key>$locations:</key>
+ <value>/principals/locations/</value>
+ </substitution>
+
+ <!-- relative path to __uids__ principal collection-->
+ <substitution>
+ <key>$uids:</key>
+ <value>/principals/locations/</value>
+ </substitution>
+
+ <!-- relative path to calendars collection-->
+ <substitution>
+ <key>$calendars:</key>
+ <value>/calendars/</value>
+ </substitution>
+
+ <!-- relative path to user calendars collection-->
+ <substitution>
+ <key>$usercalendars:</key>
+ <value>/calendars/users/</value>
+ </substitution>
+
+ <!-- inbox name-->
+ <substitution>
+ <key>$inbox:</key>
+ <value>inbox</value>
+ </substitution>
+
+ <!-- outbox name-->
+ <substitution>
+ <key>$outbox:</key>
+ <value>outbox</value>
+ </substitution>
+
<!-- user id for admin user -->
<substitution>
<key>$useradmin:</key>
@@ -43,20 +95,49 @@
<key>$pswdadmin:</key>
<value>admin</value>
</substitution>
+
<!-- relative path to admin principal resource-->
<substitution>
<key>$principaladmin:</key>
- <value>/principals/users/admin</value>
+ <value>/principals/users/admin/</value>
</substitution>
+ <substitution>
+ <key>$principaluriadmin:</key>
+ <value>/principals/__uids__/admin/</value>
+ </substitution>
+ <!-- user id for proxy user -->
+ <substitution>
+ <key>$userproxy:</key>
+ <value>superuser</value>
+ </substitution>
+ <!-- password for proxy user -->
+ <substitution>
+ <key>$pswdproxy:</key>
+ <value>superuser</value>
+ </substitution>
+
<!-- relative path to first user principal resource-->
<substitution>
<key>$userid1:</key>
<value>user01</value>
</substitution>
+ <!-- password for first user -->
+ <substitution>
+ <key>$pswd1:</key>
+ <value>user01</value>
+ </substitution>
<!-- relative path to first user principal resource-->
<substitution>
- <key>$principal:</key>
+ <key>$principal1:</key>
+ <value>/principals/users/user01/</value>
+ </substitution>
+ <substitution>
+ <key>$principaluri1:</key>
+ <value>/principals/__uids__/user01/</value>
+ </substitution>
+ <substitution>
+ <key>$principalnoslash:</key>
<value>/principals/users/user01</value>
</substitution>
<!-- relative path to first user calendar home-->
@@ -64,6 +145,24 @@
<key>$pathprefix:</key>
<value>/calendars/users/user01</value>
</substitution>
+ <!-- relative path to first user calendar home-->
+ <substitution>
+ <key>$calendarpath1:</key>
+ <value>/calendars/users/user01/calendar</value>
+ </substitution>
+ <!-- calendar user address of first user-->
+ <substitution>
+ <key>$cuaddr1:</key>
+ <value>mailto:user01 at example.com</value>
+ </substitution>
+ <substitution>
+ <key>$cuaddralt1:</key>
+ <value>/principals/__uids__/user01/</value>
+ </substitution>
+ <substitution>
+ <key>$cuaddraltnoslash1:</key>
+ <value>/principals/__uids__/user01</value>
+ </substitution>
<!-- user id for second user -->
<substitution>
@@ -78,6 +177,14 @@
<!-- relative path to second user principal resource-->
<substitution>
<key>$principal2:</key>
+ <value>/principals/users/user02/</value>
+ </substitution>
+ <substitution>
+ <key>$principaluri2:</key>
+ <value>/principals/__uids__/user02/</value>
+ </substitution>
+ <substitution>
+ <key>$principal2noslash:</key>
<value>/principals/users/user02</value>
</substitution>
<!-- relative path to second user calendar home-->
@@ -85,6 +192,19 @@
<key>$pathprefix2:</key>
<value>/calendars/users/user02</value>
</substitution>
+ <!-- calendar user address of second user-->
+ <substitution>
+ <key>$cuaddr2:</key>
+ <value>mailto:user02 at example.com</value>
+ </substitution>
+ <substitution>
+ <key>$cuaddralt2:</key>
+ <value>/principals/__uids__/user02/</value>
+ </substitution>
+ <substitution>
+ <key>$cuaddraltnoslash2:</key>
+ <value>/principals/__uids__/user02</value>
+ </substitution>
<!-- user id for third user -->
<substitution>
@@ -99,13 +219,45 @@
<!-- relative path to third user principal resource-->
<substitution>
<key>$principal3:</key>
- <value>/principals/users/user03</value>
+ <value>/principals/users/user03/</value>
</substitution>
+ <substitution>
+ <key>$principaluri3:</key>
+ <value>/principals/__uids__/user03/</value>
+ </substitution>
<!-- relative path to third user calendar home-->
<substitution>
<key>$pathprefix3:</key>
<value>/calendars/users/user03</value>
</substitution>
+ <!-- calendar user address of third user-->
+ <substitution>
+ <key>$cuaddr3:</key>
+ <value>mailto:user03 at example.com</value>
+ </substitution>
+ <substitution>
+ <key>$cuaddralt3:</key>
+ <value>/principals/__uids__/user03/</value>
+ </substitution>
+
+ <!-- relative path to first resource calendar home-->
+ <substitution>
+ <key>$rpathprefix1:</key>
+ <value>/calendars/resources/resource01</value>
+ </substitution>
+ <!-- relative path to first resource principal resource-->
+ <substitution>
+ <key>$rprincipal1:</key>
+ <value>/principals/resources/resource01/</value>
+ </substitution>
+ <substitution>
+ <key>$rprincipaluri1:</key>
+ <value>/principals/__uids__/resource01/</value>
+ </substitution>
+ <substitution>
+ <key>$rcuaddralt1:</key>
+ <value>/principals/__uids__/resource01/</value>
+ </substitution>
</substitutions>
<serverfilepath>/Users/cyrusdaboo/Documents/Development/Apple/eclipse/CalendarServer/twistedcaldav/test/data/</serverfilepath>
</serverinfo>
Modified: CalDAVTester/trunk/scripts/tests/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/acl.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/tests/acl.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -718,7 +718,7 @@
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/acls/15.xml</filepath>
@@ -728,7 +728,7 @@
<arg>
<name>okprops</name>
<value>DAV:alternate-URI-set</value>
- <value>DAV:principal-URL$<href>$principal:</href></value>
+ <value>DAV:principal-URL$<href>$principaluri1:</href></value>
<value>DAV:group-member-set</value>
<value>DAV:group-membership</value>
<value>DAV:displayname$User 01</value>
@@ -740,7 +740,7 @@
<description>Check for proper capability in DAV header</description>
<request>
<method>OPTIONS</method>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/trunk/scripts/tests/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/aclreports.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/tests/aclreports.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -186,10 +186,10 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principal:</value>
- <value>$principal:calendar-proxy-read/</value>
- <value>$principal:calendar-proxy-write/</value>
- <value>$principaladmin:</value>
+ <value>$principaluri1:</value>
+ <value>$principaluri1:calendar-proxy-read/</value>
+ <value>$principaluri1:calendar-proxy-write/</value>
+ <value>$principaluriadmin:</value>
</arg>
</verify>
</request>
@@ -276,7 +276,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</arg>
</verify>
</request>
@@ -298,7 +298,7 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</arg>
</verify>
</request>
@@ -418,7 +418,7 @@
<arg>
<name>okhrefs</name>
<value>$principals:public01/</value>
- <value>$principal:</value>
+ <value>$principal1:</value>
</arg>
</verify>
</request>
@@ -464,7 +464,7 @@
<arg>
<name>okhrefs</name>
<value>$principals:public01/</value>
- <value>$principal:</value>
+ <value>$principal1:</value>
<value>$groups:group01/</value>
<value>$rprincipal1:</value>
<value>$locations:location01/</value>
Modified: CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -39,7 +39,7 @@
<description>Look for options header tag</description>
<request print-response="no">
<method>OPTIONS</method>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/1.xml</filepath>
@@ -60,7 +60,7 @@
<description>Look for proxy principals</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/1.xml</filepath>
@@ -80,7 +80,7 @@
<description>Check resource type of read-only proxy principal</description>
<request>
<method>PROPFIND</method>
- <ruri>$principal:calendar-proxy-read/</ruri>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/1.xml</filepath>
@@ -98,7 +98,7 @@
<description>Check resource type of read-write proxy principal</description>
<request>
<method>PROPFIND</method>
- <ruri>$principal:calendar-proxy-write/</ruri>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/1.xml</filepath>
@@ -119,7 +119,7 @@
<description>Verify no group memberships right now</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -171,7 +171,7 @@
<description>Add user02 as read proxy for user01</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$principal:calendar-proxy-read/</ruri>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/3.xml</filepath>
@@ -186,7 +186,7 @@
</request>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$principal:calendar-proxy-read/</ruri>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -195,7 +195,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>DAV:group-member-set$<href>$principal2:</href></value>
+ <value>DAV:group-member-set$<href>$principaluri2:</href></value>
<value>DAV:group-membership$</value>
</arg>
</verify>
@@ -209,7 +209,7 @@
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -242,7 +242,7 @@
<arg>
<name>okprops</name>
<value>DAV:group-member-set$</value>
- <value>DAV:group-membership$<href>$principal:calendar-proxy-read/</href></value>
+ <value>DAV:group-membership$<href>$principaluri1:calendar-proxy-read/</href></value>
</arg>
</verify>
</request>
@@ -291,7 +291,7 @@
<description>Clear user02 as read-only proxy for user01</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$principal:calendar-proxy-read/</ruri>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/4.xml</filepath>
@@ -306,7 +306,7 @@
</request>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$principal:calendar-proxy-read/</ruri>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -325,7 +325,7 @@
<description>Verify no group memberships right now</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -377,7 +377,7 @@
<description>Add user02 as read-write proxy for user01</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$principal:calendar-proxy-write/</ruri>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/3.xml</filepath>
@@ -392,7 +392,7 @@
</request>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$principal:calendar-proxy-write/</ruri>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -401,7 +401,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>DAV:group-member-set$<href>$principal2:</href></value>
+ <value>DAV:group-member-set$<href>$principaluri2:</href></value>
<value>DAV:group-membership$</value>
</arg>
</verify>
@@ -415,7 +415,7 @@
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -448,7 +448,7 @@
<arg>
<name>okprops</name>
<value>DAV:group-member-set$</value>
- <value>DAV:group-membership$<href>$principal:calendar-proxy-write/</href></value>
+ <value>DAV:group-membership$<href>$principaluri1:calendar-proxy-write/</href></value>
</arg>
</verify>
</request>
@@ -487,11 +487,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal2:</value>
+ <value>$cuaddralt2:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $principal3:</value>
+ <value>$cuaddralt2:, $cuaddralt3:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -509,7 +509,7 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$principal1:</value>
</header>
<header>
<name>Recipient</name>
@@ -533,7 +533,7 @@
<description>Clear user02 as read-write proxy for user01</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$principal:calendar-proxy-write/</ruri>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/4.xml</filepath>
@@ -548,7 +548,7 @@
</request>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$principal:calendar-proxy-write/</ruri>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -567,7 +567,7 @@
<description>Verify no group memberships right now</description>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -619,7 +619,7 @@
<description>Try to add user02 and a bogus user as read-write proxy for user01</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$principal:calendar-proxy-write/</ruri>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/7.xml</filepath>
@@ -668,7 +668,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>DAV:group-member-set$<href>$principal:</href></value>
+ <value>DAV:group-member-set$<href>$principaluri1:</href></value>
<value>DAV:group-membership$</value>
</arg>
</verify>
@@ -682,7 +682,7 @@
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -691,7 +691,7 @@
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value><href>$rprincipal1:calendar-proxy-write/</href></value>
+ <value><href>$rprincipaluri1:calendar-proxy-write/</href></value>
</arg>
</verify>
</request>
@@ -703,7 +703,7 @@
<description>Add user02 and user03 as read-write proxy for user01</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$principal:calendar-proxy-write/</ruri>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/5.xml</filepath>
@@ -718,7 +718,7 @@
</request>
<request print-response="no">
<method>PROPFIND</method>
- <ruri>$principal:calendar-proxy-write/</ruri>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/2.xml</filepath>
@@ -727,7 +727,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>DAV:group-member-set$<href>$principal2:</href><href>$principal3:</href></value>
+ <value>DAV:group-member-set$<href>$principaluri3:</href><href>$principaluri2:</href></value>
<value>DAV:group-membership$</value>
</arg>
</verify>
@@ -751,7 +751,7 @@
<arg>
<name>okhrefs</name>
<value>$principal2:</value>
- <value>$principal:calendar-proxy-write/</value>
+ <value>$principal1:calendar-proxy-write/</value>
</arg>
</verify>
</request>
@@ -760,7 +760,7 @@
<description>Reset read-write proxy for user01</description>
<request print-response="no">
<method>PROPPATCH</method>
- <ruri>$principal:calendar-proxy-write/</ruri>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/calendaruserproxy/8.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/dropbox.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/tests/dropbox.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -34,7 +34,7 @@
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/dropbox/1.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepost.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/tests/schedulepost.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -480,11 +480,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $principal3:</value>
+ <value>$cuaddralt2:, $cuaddralt3:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -502,11 +502,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$host:$principal:</value>
+ <value>$host:$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$host:$principal2:, $host:$principal3:</value>
+ <value>$host:$cuaddralt2:, $host:$cuaddralt3:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -703,11 +703,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principalnoslash:</value>
+ <value>$cuaddraltnoslash1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2noslash:</value>
+ <value>$cuaddraltnoslash2:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -721,7 +721,7 @@
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>ATTENDEE;CN=User 02:/principals/users/user02</value>
+ <value>ATTENDEE;CN=User 02:$cuaddraltnoslash2:</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -61,11 +61,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -186,11 +186,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -315,11 +315,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -444,11 +444,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -581,11 +581,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -710,11 +710,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -839,11 +839,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -964,11 +964,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -1093,11 +1093,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
@@ -1222,11 +1222,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $rprincipal1:</value>
+ <value>$cuaddralt2:, $rcuaddralt1:</value>
</header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -57,11 +57,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal:</value>
+ <value>$cuaddralt1:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal2:, $principal3:</value>
+ <value>$cuaddralt2:, $cuaddralt3:</value>
</header>
<ruri>$pathprefix:/outbox/</ruri>
<data>
@@ -120,8 +120,8 @@
</arg>
<arg>
<name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">$principal:</href></value>
- <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">$principal2:</href></value>
+ <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">$cuaddralt1:</href></value>
+ <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">$cuaddralt2:</href></value>
</arg>
</verify>
</request>
@@ -147,8 +147,8 @@
</arg>
<arg>
<name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">$principal:</href></value>
- <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">$principal3:</href></value>
+ <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">$cuaddralt1:</href></value>
+ <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">$cuaddralt3:</href></value>
</arg>
</verify>
</request>
@@ -159,11 +159,11 @@
<method>POST</method>
<header>
<name>Originator</name>
- <value>$principal2:</value>
+ <value>$cuaddralt2:</value>
</header>
<header>
<name>Recipient</name>
- <value>$principal3:</value>
+ <value>$cuaddralt3:</value>
</header>
<ruri>$pathprefix2:/outbox/</ruri>
<data>
Modified: CalDAVTester/trunk/scripts/tests/scheduleprops.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/scheduleprops.xml 2007-08-01 17:33:38 UTC (rev 1746)
+++ CalDAVTester/trunk/scripts/tests/scheduleprops.xml 2007-08-01 18:03:32 UTC (rev 1747)
@@ -34,7 +34,7 @@
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal:</ruri>
+ <ruri>$principal1:</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/scheduleprops/1.xml</filepath>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070801/8db86326/attachment.html
More information about the calendarserver-changes
mailing list