[CalendarServer-changes] [1737] CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts

source_changes at macosforge.org source_changes at macosforge.org
Tue Jul 31 13:42:53 PDT 2007


Revision: 1737
          http://trac.macosforge.org/projects/calendarserver/changeset/1737
Author:   cdaboo at apple.com
Date:     2007-07-31 13:42:52 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
Last few tweaks for principal-URL changes.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/serverinfo-monitor.xml
    CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/serverinfo.xml
    CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/sslserverinfo.xml
    CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/tests/calendaruserproxy.xml

Modified: CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/serverinfo-monitor.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/serverinfo-monitor.xml	2007-07-31 20:37:08 UTC (rev 1736)
+++ CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/serverinfo-monitor.xml	2007-07-31 20:42:52 UTC (rev 1737)
@@ -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/branches/users/cdaboo/new-principal-uri-1727/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/serverinfo.xml	2007-07-31 20:37:08 UTC (rev 1736)
+++ CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/serverinfo.xml	2007-07-31 20:42:52 UTC (rev 1737)
@@ -247,6 +247,10 @@
 		<!-- 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>

Modified: CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/sslserverinfo.xml	2007-07-31 20:37:08 UTC (rev 1736)
+++ CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/server/sslserverinfo.xml	2007-07-31 20:42:52 UTC (rev 1737)
@@ -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/branches/users/cdaboo/new-principal-uri-1727/scripts/tests/calendaruserproxy.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/tests/calendaruserproxy.xml	2007-07-31 20:37:08 UTC (rev 1736)
+++ CalDAVTester/branches/users/cdaboo/new-principal-uri-1727/scripts/tests/calendaruserproxy.xml	2007-07-31 20:42:52 UTC (rev 1737)
@@ -691,7 +691,7 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>&lt;href&gt;$rprincipal1:calendar-proxy-write/&lt;/href&gt;</value>
+						<value>&lt;href&gt;$rprincipaluri1:calendar-proxy-write/&lt;/href&gt;</value>
 					</arg>
 				</verify>
 			</request>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070731/c9ed39d0/attachment.html


More information about the calendarserver-changes mailing list