[CalendarServer-changes] [3569] CalDAVTester/trunk

23 Dec 2008

Revision: 3569
          http://trac.macosforge.org/projects/calendarserver/changeset/3569
Author:   cdaboo@apple.com
Date:     2008-12-23 11:02:27 -0800 (Tue, 23 Dec 2008)
Log Message:
-----------


Modified Paths:
--------------
    CalDAVTester/trunk/Resource/aclreports/33.xml
    CalDAVTester/trunk/odsetup.py
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/tests/aclreports.xml

Modified: CalDAVTester/trunk/Resource/aclreports/33.xml
===================================================================

--- CalDAVTester/trunk/Resource/aclreports/33.xml	2008-12-23 19:01:27 UTC (rev 3568)
+++ CalDAVTester/trunk/Resource/aclreports/33.xml	2008-12-23 19:02:27 UTC (rev 3569)
@@ -5,7 +5,7 @@
    <D:prop>
      <cd:calendar-user-address-set/>
    </D:prop>
-   <D:match match-type="equals">urn:uuid:user01</D:match>
+   <D:match match-type="equals">$cuaddrurn1:</D:match>
  </D:property-search>
  <D:prop>
    <D:displayname/>

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2008-12-23 19:01:27 UTC (rev 3568)
+++ CalDAVTester/trunk/odsetup.py	2008-12-23 19:02:27 UTC (rev 3569)
@@ -37,29 +37,46 @@
 
 base_dir = "../CalendarServer/"
 
-number_of_users = 5
+number_of_users = 10
 
 guids = {
     "testadmin": "",
-    "user01":    "",
-    "user02":    "",
-    "user03":    "",
-    "resource01":"",
+    "apprentice": "",
+    "group01"   :"",
 }
 
+for i in range(1, 11):
+    guids["user%02d" % (i,)] = ""
+    guids["public%02d" % (i,)] = ""
+    guids["resource%02d" % (i,)] = ""
+    guids["location%02d" % (i,)] = ""
+
 # List of users as a tuple: (<<name>>, <<pswd>>, <<repeat count>>)
 adminattrs = {
-    "dsAttrTypeStandard:RealName":        "Test Admin",
+    "dsAttrTypeStandard:RealName":        "Super User",
+    "dsAttrTypeStandard:FirstName":       "Super",
+    "dsAttrTypeStandard:LastName":        "User",
     "dsAttrTypeStandard:EMailAddress":    "testadmin@example.com",
 }
 
+apprenticeattrs = {
+    "dsAttrTypeStandard:RealName":        "Apprentice Super User",
+    "dsAttrTypeStandard:FirstName":       "Apprentice",
+    "dsAttrTypeStandard:LastName":        "Super User",
+    "dsAttrTypeStandard:EMailAddress":    "apprentice@example.com",
+}
+
 userattrs = {
     "dsAttrTypeStandard:RealName":        "User %02d",
+    "dsAttrTypeStandard:FirstName":       "User",
+    "dsAttrTypeStandard:LastName":        "%02d",
     "dsAttrTypeStandard:EMailAddress":    "user%02d@example.com",
 }
 
 publicattrs = {
     "dsAttrTypeStandard:RealName":        "Public %02d",
+    "dsAttrTypeStandard:FirstName":       "Public",
+    "dsAttrTypeStandard:LastName":        "%02d",
     "dsAttrTypeStandard:EMailAddress":    "public%02d@example.com",
 }
 
@@ -98,6 +115,8 @@
         <true/>
         <key>CalendaringDelegate</key>
         <string>%(guid)s</string>
+        <key>ReadOnlyCalendaringDelegate</key>
+        <string>%(readonlyguid)s</string>
         <key>Label</key>
         <string>Printer</string>
     </dict>
@@ -112,6 +131,7 @@
 
 records = (
     ("/Users", "testadmin", "testadmin", adminattrs, 1),
+    ("/Users", "apprentice", "apprentice", apprenticeattrs, 1),
     ("/Users", "user%02d", "user%02d", userattrs, None),
     ("/Users", "public%02d", "public%02d", publicattrs, 10),
     ("/Places", "location%02d", "location%02d", locationattrs, 10),
@@ -188,13 +208,35 @@
     finally:
         fd.close()
 
+    subs_template = """
+        <substitution>
+            <key>%s</key>
+            <value>%s</value>
+        </substitution>
+"""
+
+    subs = [
+        ("$useradminguid:",      guids["testadmin"]),
+        ("$userapprenticeguid:", guids["apprentice"]),
+        ("$groupguid1:",         guids["group01"]),
+    ]
+    
+    for i in range(1, number_of_users + 1):
+        subs.append(("$userguid%d:" % (i,), guids["user%02d" % (i,)]))
+    for i in range(1, 11):
+        subs.append(("$publicuserguid%d:" % (i,), guids["public%02d" % (i,)]))
+    for i in range(1, 11):
+        subs.append(("$resourceguid%d:" % (i,), guids["resource%02d" % (i,)]))
+    for i in range(1, 11):
+        subs.append(("$locationguid%d:" % (i,), guids["location%02d" % (i,)]))
+    
+    subs_str = ""
+    for x, y in subs:
+        subs_str += subs_template % (x, y,)
+
     data = data % {
         "hostname"       : hostname,
-        "useradminguid"  : guids["testadmin"],
-        "userguid1"      : guids["user01"],
-        "userguid2"      : guids["user02"],
-        "userguid3"      : guids["user03"],
-        "resourceguid1"  : guids["resource01"],
+        "overrides"      : subs_str,
     }
     
     fd = open(serverinfo_default, "w")
@@ -250,7 +292,7 @@
     # Do dscl command line operations to create a calendar user
     
     # Only create if it does not exist
-    cmd = "dscl -u %s -P %s %s -list %s/%s" % (diradmin_user, diradmin_pswd, directory_node, path, user[0])
+    cmd = "dscl %s -list %s/%s" % (directory_node, path, user[0])
     if commands.getstatusoutput(cmd)[0] != 0:
         # Create the user
         cmd = "dscl -u %s -P %s %s -create %s/%s" % (diradmin_user, diradmin_pswd, directory_node, path, user[0])
@@ -268,7 +310,10 @@
             if key == "dsAttrTypeStandard:GeneratedUID":
                 value = uuid.uuid4()
             elif key == "dsAttrTypeStandard:ResourceInfo":
-                value = value % {"guid":guids["user01"]}
+                value = value % {
+                    "guid":guids["user01"],
+                    "readonlyguid":guids["user03"],
+                }
             cmd = "dscl -u %s -P %s %s -create %s/%s \"%s\" \"%s\"" % (diradmin_user, diradmin_pswd, directory_node, path, user[0], key, value)
             print cmd
             commands.getoutput(cmd)
@@ -277,7 +322,7 @@
 
     # Now read the guid for this record
     if guids.has_key(user[0]):
-        cmd = "dscl -u %s -P %s %s -read %s/%s GeneratedUID"  % (diradmin_user, diradmin_pswd, directory_node, path, user[0])
+        cmd = "dscl %s -read %s/%s GeneratedUID"  % (directory_node, path, user[0])
         result = commands.getoutput(cmd)
         guid = result.split()[1]
         guids[user[0]] = guid

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2008-12-23 19:01:27 UTC (rev 3568)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2008-12-23 19:02:27 UTC (rev 3569)
@@ -157,17 +157,17 @@
 		<!-- user id for admin user -->
 		<substitution>
 			<key>$useradmin:</key>
-			<value>admin</value>
+			<value>testadmin</value>
 		</substitution>
 		<!-- guid for admin user -->
 		<substitution>
 			<key>$useradminguid:</key>
-			<value>%(useradminguid)s</value>
+			<value>testadmin</value>
 		</substitution>
 		<!-- password for admin user -->
 		<substitution>
 			<key>$pswdadmin:</key>
-			<value>admin</value>
+			<value>testadmin</value>
 		</substitution>
 
 		<!-- relative path to admin principal resource-->
@@ -180,6 +180,32 @@
 			<value>$principals_uids:$useradminguid:/</value>
 		</substitution>
 
+		<!-- user id for apprentice user -->
+		<substitution>
+			<key>$userapprentice:</key>
+			<value>apprentice</value>
+		</substitution>
+		<!-- guid for apprentice user -->
+		<substitution>
+			<key>$userapprenticeguid:</key>
+			<value>apprentice</value>
+		</substitution>
+		<!-- password for admin user -->
+		<substitution>
+			<key>$pswdapprentice:</key>
+			<value>apprentice</value>
+		</substitution>
+
+		<!-- relative path to apprentice principal resource-->
+		<substitution>
+			<key>$principal_apprentice:</key>
+			<value>$principals_users:$userapprentice:/</value>
+		</substitution>
+		<substitution>
+			<key>$principaluri_apprentice:</key>
+			<value>$principals_uids:$userapprenticeguid:/</value>
+		</substitution>
+
 		<!-- user id for proxy user -->
 		<substitution>
 			<key>$userproxy:</key>
@@ -284,80 +310,212 @@
 			</substitution>
 		</repeat>
 
-		<!--  Override some of the above definitions for special cases -->
+		<!--  Ten public accounts -->
+		<repeat count="10">
+			<!-- user id -->
+			<substitution>
+				<key>$publicuserid%%d:</key>
+				<value>public%%02d</value>
+			</substitution>
+			<!-- user guid -->
+			<substitution>
+				<key>$publicuserguid%%d:</key>
+				<value>public%%02d</value>
+			</substitution>
+			<!-- user name -->
+			<substitution>
+				<key>$publicusername%%d:</key>
+				<value>Public %%02d</value>
+			</substitution>
+			<!-- password -->
+			<substitution>
+				<key>$publicpswd%%d:</key>
+				<value>public%%02d</value>
+			</substitution>
+			<!-- relative path to user principal resource-->
+			<substitution>
+				<key>$publicprincipal%%d:</key>
+				<value>$principals_users:$publicuserid%%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$publicprincipaluri%%d:</key>
+				<value>$principals_uids:$publicuserguid%%d:/</value>
+			</substitution>
+			<!-- relative path to user calendar home-->
+			<substitution>
+				<key>$publicpathprefix%%d:</key>
+				<value>$calendars_uids:$publicuserguid%%d:</value>
+			</substitution>
+			<!-- relative path to user calendar-->
+			<substitution>
+				<key>$publiccalendarpath%%d:</key>
+				<value>$calendars_uids:$publicuserguid%%d:/$calendar:</value>
+			</substitution>
+			<substitution>
+				<key>$publicemail%%d:</key>
+				<value>$publicuserid%%d:@example.com</value>
+			</substitution>
+			<!-- calendar user address of user-->
+			<substitution>
+				<key>$publiccuaddr%%d:</key>
+				<value>mailto:$publicemail%%d:</value>
+			</substitution>
+			<substitution>
+				<key>$publiccuaddralt%%d:</key>
+				<value>$publicprincipaluri%%d:</value>
+			</substitution>
+			<substitution>
+				<key>$publiccuaddrurn%%d:</key>
+				<value>urn:uuid:$publicuserguid%%d:</value>
+			</substitution>
+		</repeat>
 
-		<!-- calendar user address of second user-->
-		<substitution>
-			<key>$cuaddr2:</key>
-			<value>MAILTO:$email2:</value>
-		</substitution>
+		<!--  Ten resource accounts -->
+		<repeat count="10">
+			<substitution>
+				<key>$resourceid%%d:</key>
+				<value>resource%%02d</value>
+			</substitution>
+			<!-- resource guid-->
+			<substitution>
+				<key>$resourceguid%%d:</key>
+				<value>resource%%02d</value>
+			</substitution>
+			<!-- resource name-->
+			<substitution>
+				<key>$resourcename%%d:</key>
+				<value>Resource %%02d</value>
+			</substitution>
+			<!-- relative path to first resource calendar home-->
+			<substitution>
+				<key>$rpathprefix%%d:</key>
+				<value>$calendars_uids:$resourceguid%%d:</value>
+			</substitution>
+			<!-- relative path to first resource calendar home-->
+			<substitution>
+				<key>$rcalendarpath%%d:</key>
+				<value>$calendars_uids:$resourceguid%%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to first resource inbox-->
+			<substitution>
+				<key>$rinboxpath%%d:</key>
+				<value>$calendars_uids:$resourceguid%%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to first resource outbox-->
+			<substitution>
+				<key>$routboxpath%%d:</key>
+				<value>$calendars_uids:$resourceguid%%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to first resource principal resource-->
+			<substitution>
+				<key>$rprincipal%%d:</key>
+				<value>$principals_resources:$resourceid%%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$rprincipaluri%%d:</key>
+				<value>$principals_uids:$resourceguid%%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$rcuaddralt%%d:</key>
+				<value>$rprincipaluri%%d:</value>
+			</substitution>
+			<substitution>
+				<key>$rcuaddrurn%%d:</key>
+				<value>urn:uuid:$resourceguid%%d:</value>
+			</substitution>
+		</repeat>
 
-		<substitution>
-			<key>$userguid1:</key>
-			<value>%(userguid1)s</value>
-		</substitution>
-		<substitution>
-			<key>$userguid12:</key>
-			<value>%(userguid2)s</value>
-		</substitution>
-		<substitution>
-			<key>$userguid3:</key>
-			<value>%(userguid3)s</value>
-		</substitution>
+		<!--  Ten Location accounts -->
+		<repeat count="10">
+			<substitution>
+				<key>$locationid%%d:</key>
+				<value>location%%02d</value>
+			</substitution>
+			<!-- location guid-->
+			<substitution>
+				<key>$locationguid%%d:</key>
+				<value>location%%02d</value>
+			</substitution>
+			<!-- location name-->
+			<substitution>
+				<key>$locationname%%d:</key>
+				<value>Location %%02d</value>
+			</substitution>
+			<!-- relative path to first location calendar home-->
+			<substitution>
+				<key>$lpathprefix%%d:</key>
+				<value>$calendars_uids:$locationguid%%d:</value>
+			</substitution>
+			<!-- relative path to first location calendar home-->
+			<substitution>
+				<key>$lcalendarpath%%d:</key>
+				<value>$calendars_uids:$locationguid%%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to first location inbox-->
+			<substitution>
+				<key>$linboxpath%%d:</key>
+				<value>$calendars_uids:$locationguid%%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to first location outbox-->
+			<substitution>
+				<key>$loutboxpath%%d:</key>
+				<value>$calendars_uids:$locationguid%%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to first location principal resource-->
+			<substitution>
+				<key>$lprincipal%%d:</key>
+				<value>$principals_resources:$locationid%%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$lprincipaluri%%d:</key>
+				<value>$principals_uids:$locationguid%%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$lcuaddralt%%d:</key>
+				<value>$lprincipaluri%%d:</value>
+			</substitution>
+			<substitution>
+				<key>$lcuaddrurn%%d:</key>
+				<value>urn:uuid:$locationguid%%d:</value>
+			</substitution>
+		</repeat>
 
-		<!-- resource id-->
-		<substitution>
-			<key>$resourceid1:</key>
-			<value>resource01</value>
-		</substitution>
-		<!-- resource guid-->
-		<substitution>
-			<key>$resourceguid1:</key>
-			<value>%(resourceguid1)s</value>
-		</substitution>
-		<!-- resource name-->
-		<substitution>
-			<key>$resourcename1:</key>
-			<value>Resource 01</value>
-		</substitution>
-		<!-- relative path to first resource calendar home-->
-		<substitution>
-			<key>$rpathprefix1:</key>
-			<value>$calendars_uids:$resourceguid1:</value>
-		</substitution>
-		<!-- relative path to first resource calendar home-->
-		<substitution>
-			<key>$rcalendarpath1:</key>
-			<value>$calendars_uids:$resourceguid1:/$calendar:</value>
-		</substitution>
-		<!-- relative path to first resource inbox-->
-		<substitution>
-			<key>$rinboxpath1:</key>
-			<value>$calendars_uids:$resourceguid1:/$inbox:</value>
-		</substitution>
-		<!-- relative path to first resource outbox-->
-		<substitution>
-			<key>$routboxpath1:</key>
-			<value>$calendars_uids:$resourceguid1:/$outbox:</value>
-		</substitution>
-		<!-- relative path to first resource principal resource-->
-		<substitution>
-			<key>$rprincipal1:</key>
-			<value>$principals_resources:$resourceid1:/</value>
-		</substitution>
-		<substitution>
-			<key>$rprincipaluri1:</key>
-			<value>$principals_uids:$resourceguid1:/</value>
-		</substitution>
-		<substitution>
-			<key>$rcuaddralt1:</key>
-			<value>$rprincipaluri1:</value>
-		</substitution>
-		<substitution>
-			<key>$rcuaddrurn1:</key>
-			<value>urn:uuid:$resourceguid1:</value>
-		</substitution>
 
+		<!--  One Group account -->
+		<repeat count="1">
+			<substitution>
+				<key>$groupid%%d:</key>
+				<value>group%%02d</value>
+			</substitution>
+			<!-- group guid-->
+			<substitution>
+				<key>$groupguid%%d:</key>
+				<value>group%%02d</value>
+			</substitution>
+			<!-- group name-->
+			<substitution>
+				<key>$groupname%%d:</key>
+				<value>Group %%02d</value>
+			</substitution>
+			<!-- relative path to first group principal resource-->
+			<substitution>
+				<key>$gprincipal%%d:</key>
+				<value>$principals_resources:$groupid%%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$gprincipaluri%%d:</key>
+				<value>$principals_uids:$groupguid%%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$gcuaddralt%%d:</key>
+				<value>$gprincipaluri%%d:</value>
+			</substitution>
+			<substitution>
+				<key>$gcuaddrurn%%d:</key>
+				<value>urn:uuid:$groupguid%%d:</value>
+			</substitution>
+		</repeat>
+
 		<!-- relative path to disabled group principal resource-->
 		<substitution>
 			<key>$principaldisabled:</key>
@@ -373,5 +531,15 @@
 			<value>$principals_uids:disabledgroup/</value>
 		</substitution>
 
+		<!--  Override some of the above definitions for special cases -->
+
+		<!-- calendar user address of second user-->
+		<substitution>
+			<key>$cuaddr2:</key>
+			<value>MAILTO:$email2:</value>
+		</substitution>
+
+		%(overrides)s
+
 	</substitutions>
 </serverinfo>

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2008-12-23 19:01:27 UTC (rev 3568)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2008-12-23 19:02:27 UTC (rev 3569)
@@ -180,6 +180,32 @@
 			<value>$principals_uids:$useradminguid:/</value>
 		</substitution>
 
+		<!-- user id for apprentice user -->
+		<substitution>
+			<key>$userapprentice:</key>
+			<value>apprentice</value>
+		</substitution>
+		<!-- guid for apprentice user -->
+		<substitution>
+			<key>$userapprenticeguid:</key>
+			<value>apprentice</value>
+		</substitution>
+		<!-- password for admin user -->
+		<substitution>
+			<key>$pswdapprentice:</key>
+			<value>apprentice</value>
+		</substitution>
+
+		<!-- relative path to apprentice principal resource-->
+		<substitution>
+			<key>$principal_apprentice:</key>
+			<value>$principals_users:$userapprentice:/</value>
+		</substitution>
+		<substitution>
+			<key>$principaluri_apprentice:</key>
+			<value>$principals_uids:$userapprenticeguid:/</value>
+		</substitution>
+
 		<!-- user id for proxy user -->
 		<substitution>
 			<key>$userproxy:</key>
@@ -284,67 +310,212 @@
 			</substitution>
 		</repeat>
 
-		<!--  Override some of the above definitions for special cases -->
+		<!--  Ten public accounts -->
+		<repeat count="10">
+			<!-- user id -->
+			<substitution>
+				<key>$publicuserid%d:</key>
+				<value>public%02d</value>
+			</substitution>
+			<!-- user guid -->
+			<substitution>
+				<key>$publicuserguid%d:</key>
+				<value>public%02d</value>
+			</substitution>
+			<!-- user name -->
+			<substitution>
+				<key>$publicusername%d:</key>
+				<value>Public %02d</value>
+			</substitution>
+			<!-- password -->
+			<substitution>
+				<key>$publicpswd%d:</key>
+				<value>public%02d</value>
+			</substitution>
+			<!-- relative path to user principal resource-->
+			<substitution>
+				<key>$publicprincipal%d:</key>
+				<value>$principals_users:$publicuserid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$publicprincipaluri%d:</key>
+				<value>$principals_uids:$publicuserguid%d:/</value>
+			</substitution>
+			<!-- relative path to user calendar home-->
+			<substitution>
+				<key>$publicpathprefix%d:</key>
+				<value>$calendars_uids:$publicuserguid%d:</value>
+			</substitution>
+			<!-- relative path to user calendar-->
+			<substitution>
+				<key>$publiccalendarpath%d:</key>
+				<value>$calendars_uids:$publicuserguid%d:/$calendar:</value>
+			</substitution>
+			<substitution>
+				<key>$publicemail%d:</key>
+				<value>$publicuserid%d:@example.com</value>
+			</substitution>
+			<!-- calendar user address of user-->
+			<substitution>
+				<key>$publiccuaddr%d:</key>
+				<value>mailto:$publicemail%d:</value>
+			</substitution>
+			<substitution>
+				<key>$publiccuaddralt%d:</key>
+				<value>$publicprincipaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$publiccuaddrurn%d:</key>
+				<value>urn:uuid:$publicuserguid%d:</value>
+			</substitution>
+		</repeat>
 
-		<!-- calendar user address of second user-->
-		<substitution>
-			<key>$cuaddr2:</key>
-			<value>MAILTO:$email2:</value>
-		</substitution>
+		<!--  Ten resource accounts -->
+		<repeat count="10">
+			<substitution>
+				<key>$resourceid%d:</key>
+				<value>resource%02d</value>
+			</substitution>
+			<!-- resource guid-->
+			<substitution>
+				<key>$resourceguid%d:</key>
+				<value>resource%02d</value>
+			</substitution>
+			<!-- resource name-->
+			<substitution>
+				<key>$resourcename%d:</key>
+				<value>Resource %02d</value>
+			</substitution>
+			<!-- relative path to first resource calendar home-->
+			<substitution>
+				<key>$rpathprefix%d:</key>
+				<value>$calendars_uids:$resourceguid%d:</value>
+			</substitution>
+			<!-- relative path to first resource calendar home-->
+			<substitution>
+				<key>$rcalendarpath%d:</key>
+				<value>$calendars_uids:$resourceguid%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to first resource inbox-->
+			<substitution>
+				<key>$rinboxpath%d:</key>
+				<value>$calendars_uids:$resourceguid%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to first resource outbox-->
+			<substitution>
+				<key>$routboxpath%d:</key>
+				<value>$calendars_uids:$resourceguid%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to first resource principal resource-->
+			<substitution>
+				<key>$rprincipal%d:</key>
+				<value>$principals_resources:$resourceid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$rprincipaluri%d:</key>
+				<value>$principals_uids:$resourceguid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$rcuaddralt%d:</key>
+				<value>$rprincipaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$rcuaddrurn%d:</key>
+				<value>urn:uuid:$resourceguid%d:</value>
+			</substitution>
+		</repeat>
 
-		<!-- resource id-->
-		<substitution>
-			<key>$resourceid1:</key>
-			<value>resource01</value>
-		</substitution>
-		<!-- resource guid-->
-		<substitution>
-			<key>$resourceguid1:</key>
-			<value>resource01</value>
-		</substitution>
-		<!-- resource name-->
-		<substitution>
-			<key>$resourcename1:</key>
-			<value>Resource 01</value>
-		</substitution>
-		<!-- relative path to first resource calendar home-->
-		<substitution>
-			<key>$rpathprefix1:</key>
-			<value>$calendars_uids:$resourceguid1:</value>
-		</substitution>
-		<!-- relative path to first resource calendar home-->
-		<substitution>
-			<key>$rcalendarpath1:</key>
-			<value>$calendars_uids:$resourceguid1:/$calendar:</value>
-		</substitution>
-		<!-- relative path to first resource inbox-->
-		<substitution>
-			<key>$rinboxpath1:</key>
-			<value>$calendars_uids:$resourceguid1:/$inbox:</value>
-		</substitution>
-		<!-- relative path to first resource outbox-->
-		<substitution>
-			<key>$routboxpath1:</key>
-			<value>$calendars_uids:$resourceguid1:/$outbox:</value>
-		</substitution>
-		<!-- relative path to first resource principal resource-->
-		<substitution>
-			<key>$rprincipal1:</key>
-			<value>$principals_resources:$resourceid1:/</value>
-		</substitution>
-		<substitution>
-			<key>$rprincipaluri1:</key>
-			<value>$principals_uids:$resourceguid1:/</value>
-		</substitution>
-		<substitution>
-			<key>$rcuaddralt1:</key>
-			<value>$rprincipaluri1:</value>
-		</substitution>
-		<substitution>
-			<key>$rcuaddrurn1:</key>
-			<value>urn:uuid:$resourceguid1:</value>
-		</substitution>
+		<!--  Ten Location accounts -->
+		<repeat count="10">
+			<substitution>
+				<key>$locationid%d:</key>
+				<value>location%02d</value>
+			</substitution>
+			<!-- location guid-->
+			<substitution>
+				<key>$locationguid%d:</key>
+				<value>location%02d</value>
+			</substitution>
+			<!-- location name-->
+			<substitution>
+				<key>$locationname%d:</key>
+				<value>Location %02d</value>
+			</substitution>
+			<!-- relative path to first location calendar home-->
+			<substitution>
+				<key>$lpathprefix%d:</key>
+				<value>$calendars_uids:$locationguid%d:</value>
+			</substitution>
+			<!-- relative path to first location calendar home-->
+			<substitution>
+				<key>$lcalendarpath%d:</key>
+				<value>$calendars_uids:$locationguid%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to first location inbox-->
+			<substitution>
+				<key>$linboxpath%d:</key>
+				<value>$calendars_uids:$locationguid%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to first location outbox-->
+			<substitution>
+				<key>$loutboxpath%d:</key>
+				<value>$calendars_uids:$locationguid%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to first location principal resource-->
+			<substitution>
+				<key>$lprincipal%d:</key>
+				<value>$principals_resources:$locationid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$lprincipaluri%d:</key>
+				<value>$principals_uids:$locationguid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$lcuaddralt%d:</key>
+				<value>$lprincipaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$lcuaddrurn%d:</key>
+				<value>urn:uuid:$locationguid%d:</value>
+			</substitution>
+		</repeat>
 
+
+		<!--  One Group account -->
+		<repeat count="1">
+			<substitution>
+				<key>$groupid%d:</key>
+				<value>group%02d</value>
+			</substitution>
+			<!-- group guid-->
+			<substitution>
+				<key>$groupguid%d:</key>
+				<value>group%02d</value>
+			</substitution>
+			<!-- group name-->
+			<substitution>
+				<key>$groupname%d:</key>
+				<value>Group %02d</value>
+			</substitution>
+			<!-- relative path to first group principal resource-->
+			<substitution>
+				<key>$gprincipal%d:</key>
+				<value>$principals_resources:$groupid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$gprincipaluri%d:</key>
+				<value>$principals_uids:$groupguid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$gcuaddralt%d:</key>
+				<value>$gprincipaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$gcuaddrurn%d:</key>
+				<value>urn:uuid:$groupguid%d:</value>
+			</substitution>
+		</repeat>
+
 		<!-- relative path to disabled group principal resource-->
 		<substitution>
 			<key>$principaldisabled:</key>
@@ -360,5 +531,13 @@
 			<value>$principals_uids:disabledgroup/</value>
 		</substitution>
 
+		<!--  Override some of the above definitions for special cases -->
+
+		<!-- calendar user address of second user-->
+		<substitution>
+			<key>$cuaddr2:</key>
+			<value>MAILTO:$email2:</value>
+		</substitution>
+
 	</substitutions>
 </serverinfo>

Modified: CalDAVTester/trunk/scripts/tests/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/aclreports.xml	2008-12-23 19:01:27 UTC (rev 3568)
+++ CalDAVTester/trunk/scripts/tests/aclreports.xml	2008-12-23 19:02:27 UTC (rev 3569)
@@ -419,7 +419,7 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:public01/</value>
+						<value>$publicprincipaluri1:</value>
 						<value>$principaluri1:</value>
 					</arg>
 				</verify>
@@ -442,7 +442,7 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:public02/</value>
+						<value>$publicprincipaluri2:</value>
 						<value>$principaluri2:</value>
 					</arg>
 				</verify>
@@ -465,11 +465,11 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:public01/</value>
+						<value>$publicprincipaluri1:</value>
 						<value>$principaluri1:</value>
-						<value>$principals_uids:group01/</value>
+						<value>$gprincipaluri1:</value>
 						<value>$rprincipaluri1:</value>
-						<value>$principals_uids:location01/</value>
+						<value>$lprincipaluri1:</value>
 					</arg>
 				</verify>
 			</request>
@@ -491,10 +491,10 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:public02/</value>
+						<value>$publicprincipaluri2:</value>
 						<value>$principaluri2:</value>
-						<value>$principals_uids:resource02/</value>
-						<value>$principals_uids:location02/</value>
+						<value>$rprincipaluri2:</value>
+						<value>$lprincipaluri2:</value>
 					</arg>
 				</verify>
 			</request>
@@ -516,7 +516,7 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:apprentice/</value>
+						<value>$principaluri_apprentice:</value>
 					</arg>
 				</verify>
 			</request>
@@ -538,8 +538,8 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:admin/</value>
-						<value>$principals_uids:apprentice/</value>
+						<value>$principaluri_admin:</value>
+						<value>$principaluri_apprentice:</value>
 					</arg>
 				</verify>
 			</request>
@@ -561,7 +561,7 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:location03/</value>
+						<value>$lprincipaluri3:</value>
 					</arg>
 				</verify>
 			</request>
@@ -583,7 +583,7 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:resource03/</value>
+						<value>$rprincipaluri3:</value>
 					</arg>
 				</verify>
 			</request>
@@ -605,7 +605,7 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:admin/</value>
+						<value>$principaluri_admin:</value>
 					</arg>
 					<arg>
 						<name>badhrefs</name>
@@ -783,7 +783,7 @@
 					</arg>
 					<arg>
 						<name>okhrefs</name>
-						<value>$principals_uids:user01/</value>
+						<value>$principaluri1:</value>
 					</arg>
 				</verify>
 			</request>

    

[CalendarServer-changes] [3569] CalDAVTester/trunk

source_changes＠macosforge.org