[CalendarServer-changes] [13342] CalDAVTester/trunk/scripts/server

[source_changes at macosforge.org]

Revision: 13342
          http://trac.calendarserver.org//changeset/13342
Author:   sagen at apple.com
Date:     2014-04-21 08:21:37 -0700 (Mon, 21 Apr 2014)
Log Message:
-----------
Also update the -pod and -template versions of serverinfo.xml

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

Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2014-04-21 05:11:50 UTC (rev 13341)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2014-04-21 15:21:37 UTC (rev 13342)
@@ -491,15 +491,15 @@
 			</substitution>
 			<substitution>
 				<key>$cuaddralt%d:</key>
-				<value>$principaluri%d:</value>
+				<value>$cuaddr%d:</value>
 			</substitution>
 			<substitution>
 				<key>$cuaddraltnoslash%d:</key>
-				<value>$principals_uids:$userguid%d:</value>
+				<value>$cuaddr%d:</value>
 			</substitution>
 			<substitution>
 				<key>$cuaddrurn%d:</key>
-				<value>urn:uuid:$userguid%d:</value>
+				<value>urn:x-uid:$userguid%d:</value>
 			</substitution>
 
 			<!-- relative path to user addressbook home-->
@@ -626,7 +626,7 @@
 			</substitution>
 			<substitution>
 				<key>$pcuaddralt%d:</key>
-				<value>$pprincipaluri%d:</value>
+				<value>$pcuaddr%d:</value>
 			</substitution>
 			<substitution>
 				<key>$pcuaddraltnoslash%d:</key>
@@ -634,7 +634,7 @@
 			</substitution>
 			<substitution>
 				<key>$pcuaddrurn%d:</key>
-				<value>urn:uuid:$puserguid%d:</value>
+				<value>urn:x-uid:$puserguid%d:</value>
 			</substitution>
 
 			<!-- relative path to user addressbook home-->

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2014-04-21 05:11:50 UTC (rev 13341)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2014-04-21 15:21:37 UTC (rev 13342)
@@ -522,15 +522,15 @@
 			</substitution>
 			<substitution>
 				<key>$cuaddralt%%d:</key>
-				<value>$principaluri%%d:</value>
+				<value>$cuaddr%d:</value>
 			</substitution>
 			<substitution>
 				<key>$cuaddraltnoslash%%d:</key>
-				<value>$principals_uids:$userguid%%d:</value>
+				<value>$cuaddr%d:</value>
 			</substitution>
 			<substitution>
 				<key>$cuaddrurn%%d:</key>
-				<value>urn:uuid:$userguid%%d:</value>
+				<value>urn:x-uid:$userguid%d:</value>
 			</substitution>
 
 			<!-- relative path to user addressbook home-->
@@ -597,11 +597,11 @@
 			</substitution>
 			<substitution>
 				<key>$publiccuaddralt%%d:</key>
-				<value>$publicprincipaluri%%d:</value>
+				<value>$publiccuaddr%d:</value>
 			</substitution>
 			<substitution>
 				<key>$publiccuaddrurn%%d:</key>
-				<value>urn:uuid:$publicuserguid%%d:</value>
+				<value>urn:x-uid:$publicuserguid%d:</value>
 			</substitution>
 		</repeat>
 
@@ -652,11 +652,11 @@
 			</substitution>
 			<substitution>
 				<key>$rcuaddralt%%d:</key>
-				<value>$rprincipaluri%%d:</value>
+				<value>$rcuaddrurn%%d:</value>
 			</substitution>
 			<substitution>
 				<key>$rcuaddrurn%%d:</key>
-				<value>urn:uuid:$resourceguid%%d:</value>
+				<value>urn:x-uid:$resourceguid%%d:</value>
 			</substitution>
 		</repeat>
 
@@ -711,7 +711,7 @@
 			</substitution>
 			<substitution>
 				<key>$lcuaddrurn%%d:</key>
-				<value>urn:uuid:$locationguid%%d:</value>
+				<value>urn:x-uid:$locationguid%%d:</value>
 			</substitution>
 		</repeat>
 
@@ -747,7 +747,7 @@
 			</substitution>
 			<substitution>
 				<key>$gcuaddrurn%%d:</key>
-				<value>urn:uuid:$groupguid%%d:</value>
+				<value>urn:x-uid:$groupguid%%d:</value>
 			</substitution>
 		</repeat>
 
@@ -787,7 +787,7 @@
 		</substitution>
 		<substitution>
 			<key>$i18ncuaddrurn:</key>
-			<value>urn:uuid:$i18nguid:</value>
+			<value>urn:x-uid:$i18nguid:</value>
 		</substitution>
 
 		<!-- relative path to disabled group principal resource-->
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140421/261b768d/attachment.html>