[CalendarServer-changes] [3087] CalDAVTester/trunk/scripts

[source_changes at macosforge.org]

Revision: 3087
          http://trac.macosforge.org/projects/calendarserver/changeset/3087
Author:   cdaboo at apple.com
Date:     2008-09-26 19:47:46 -0700 (Fri, 26 Sep 2008)
Log Message:
-----------
Principal property search report changed slightly.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/tests/aclreports.xml

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2008-09-27 02:44:51 UTC (rev 3086)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2008-09-27 02:47:46 UTC (rev 3087)
@@ -57,7 +57,7 @@
 		<!-- relative path to __uids__ principal collection-->
 		<substitution>
 			<key>$uids:</key>
-			<value>/principals/locations/</value>
+			<value>/principals/__uids__/</value>
 		</substitution>
 
 		<!-- relative path to calendars collection-->

Modified: CalDAVTester/trunk/scripts/tests/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/aclreports.xml	2008-09-27 02:44:51 UTC (rev 3086)
+++ CalDAVTester/trunk/scripts/tests/aclreports.xml	2008-09-27 02:47:46 UTC (rev 3087)
@@ -417,8 +417,8 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals:public01/</value>
-						<value>$principal1:</value>
+						<value>$uids:public01/</value>
+						<value>$principaluri1:</value>
 					</arg>
 				</verify>
 			</request>
@@ -440,8 +440,8 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals:public02/</value>
-						<value>$principal2:</value>
+						<value>$uids:public02/</value>
+						<value>$principaluri2:</value>
 					</arg>
 				</verify>
 			</request>
@@ -463,11 +463,11 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals:public01/</value>
-						<value>$principal1:</value>
-						<value>$groups:group01/</value>
-						<value>$rprincipal1:</value>
-						<value>$locations:location01/</value>
+						<value>$uids:public01/</value>
+						<value>$principaluri1:</value>
+						<value>$uids:group01/</value>
+						<value>$rprincipaluri1:</value>
+						<value>$uids:location01/</value>
 					</arg>
 				</verify>
 			</request>
@@ -489,10 +489,10 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals:public02/</value>
-						<value>$principals:$userid2:/</value>
-						<value>$resources:resource02/</value>
-						<value>$locations:location02/</value>
+						<value>$uids:public02/</value>
+						<value>$principaluri2:</value>
+						<value>$uids:resource02/</value>
+						<value>$uids:location02/</value>
 					</arg>
 				</verify>
 			</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080926/f5fed029/attachment.html