[CalendarServer-changes] [682] CalDAVTester/trunk/scripts/server/serverinfo.xml

[source_changes at macosforge.org]

Revision: 682
          http://trac.macosforge.org/projects/calendarserver/changeset/682
Author:   cdaboo at apple.com
Date:     2006-12-05 08:13:11 -0800 (Tue, 05 Dec 2006)

Log Message:
-----------
More substitutions. Match latest server changes.

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

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2006-12-05 16:12:12 UTC (rev 681)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2006-12-05 16:13:11 UTC (rev 682)
@@ -29,6 +29,18 @@
 			<value>http://localhost:8008</value>
 		</substitution>
 
+		<!-- relative path to principal collection-->
+		<substitution>
+			<key>$principals:</key>
+			<value>/principals/user/</value>
+		</substitution>
+
+		<!-- relative path to resource principal collection-->
+		<substitution>
+			<key>$resources:</key>
+			<value>/principals/resource/</value>
+		</substitution>
+
 		<!-- user id for admin user -->
 		<substitution>
 			<key>$useradmin:</key>
@@ -42,9 +54,15 @@
 		<!-- relative path to admin principal resource-->
 		<substitution>
 			<key>$principaladmin:</key>
-			<value>/principals/users/admin</value>
+			<value>/principals/user/admin</value>
 		</substitution>
 
+		<!-- relative path to principal collection-->
+		<substitution>
+			<key>$principals:</key>
+			<value>/principals/user/</value>
+		</substitution>
+
 		<!-- relative path to first user principal resource-->
 		<substitution>
 			<key>$userid1:</key>
@@ -58,18 +76,23 @@
 		<!-- relative path to first user principal resource-->
 		<substitution>
 			<key>$principal:</key>
-			<value>/principals/users/user01</value>
+			<value>/principals/user/user01</value>
 		</substitution>
 		<!-- relative path to first user calendar home-->
 		<substitution>
 			<key>$pathprefix:</key>
-			<value>/calendars/users/user01</value>
+			<value>/calendars/user/user01</value>
 		</substitution>
 		<!-- relative path to first user calendar home-->
 		<substitution>
 			<key>$calendarpath1:</key>
-			<value>/calendars/users/user01/calendar</value>
+			<value>/calendars/user/user01/calendar</value>
 		</substitution>
+		<!-- calendar user address of first user-->
+		<substitution>
+			<key>$cuaddr1:</key>
+			<value>mailto:user01 at example.com</value>
+		</substitution>
 		
 		<!-- user id for second user -->
 		<substitution>
@@ -84,13 +107,18 @@
 		<!-- relative path to second user principal resource-->
 		<substitution>
 			<key>$principal2:</key>
-			<value>/principals/users/user02</value>
+			<value>/principals/user/user02</value>
 		</substitution>
 		<!-- relative path to second user calendar home-->
 		<substitution>
 			<key>$pathprefix2:</key>
-			<value>/calendars/users/user02</value>
+			<value>/calendars/user/user02</value>
 		</substitution>
+		<!-- calendar user address of second user-->
+		<substitution>
+			<key>$cuaddr2:</key>
+			<value>mailto:user02 at example.com</value>
+		</substitution>
 		
 		<!-- user id for third user -->
 		<substitution>
@@ -105,13 +133,29 @@
 		<!-- relative path to third user principal resource-->
 		<substitution>
 			<key>$principal3:</key>
-			<value>/principals/users/user03</value>
+			<value>/principals/user/user03</value>
 		</substitution>
 		<!-- relative path to third user calendar home-->
 		<substitution>
 			<key>$pathprefix3:</key>
-			<value>/calendars/users/user03</value>
+			<value>/calendars/user/user03</value>
 		</substitution>
+		<!-- calendar user address of third user-->
+		<substitution>
+			<key>$cuaddr3:</key>
+			<value>mailto:user03 at example.com</value>
+		</substitution>
+
+		<!-- relative path to first resource calendar home-->
+		<substitution>
+			<key>$rpathprefix1:</key>
+			<value>/calendars/resource/resource01</value>
+		</substitution>
+		<!-- relative path to first resource principal resource-->
+		<substitution>
+			<key>$rprincipal1:</key>
+			<value>/principals/resource/resource01</value>
+		</substitution>
 	</substitutions>
 	<serverfilepath>/Users/cyrusdaboo/Documents/Development/Apple/eclipse/CalendarServer/twistedcaldav/test/data/</serverfilepath>
 </serverinfo>

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