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

[source_changes at macosforge.org]

Revision: 13332
          http://trac.calendarserver.org//changeset/13332
Author:   sagen at apple.com
Date:     2014-04-18 13:46:13 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
Switch to using urn:x-uid: CUAs, and also stop using /principals/... CUAs

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

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2014-04-18 20:38:33 UTC (rev 13331)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2014-04-18 20:46:13 UTC (rev 13332)
@@ -523,15 +523,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-->
@@ -598,11 +598,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>
 
@@ -653,11 +653,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>
 
@@ -712,7 +712,7 @@
 			</substitution>
 			<substitution>
 				<key>$lcuaddrurn%d:</key>
-				<value>urn:uuid:$locationguid%d:</value>
+				<value>urn:x-uid:$locationguid%d:</value>
 			</substitution>
 		</repeat>
 
@@ -748,7 +748,7 @@
 			</substitution>
 			<substitution>
 				<key>$gcuaddrurn%d:</key>
-				<value>urn:uuid:$groupguid%d:</value>
+				<value>urn:x-uid:$groupguid%d:</value>
 			</substitution>
 		</repeat>
 
@@ -788,7 +788,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-->

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml	2014-04-18 20:38:33 UTC (rev 13331)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml	2014-04-18 20:46:13 UTC (rev 13332)
@@ -123,7 +123,7 @@
 					<callback>propfindItems</callback>
 					<arg>
 						<name>okprops</name>
-						<value><![CDATA[{DAV:}resource-id$<href xmlns="DAV:">urn:uuid:$userguid1:</href>]]></value>
+						<value><![CDATA[{DAV:}resource-id$<href xmlns="DAV:">urn:x-uid:$userguid1:</href>]]></value>
 					</arg>
 				</verify>
 			</request>
@@ -145,7 +145,7 @@
 					<callback>propfindItems</callback>
 					<arg>
 						<name>okprops</name>
-						<value><![CDATA[{DAV:}resource-id$<href xmlns="DAV:">urn:uuid:$userguid1:</href>]]></value>
+						<value><![CDATA[{DAV:}resource-id$<href xmlns="DAV:">urn:x-uid:$userguid1:</href>]]></value>
 					</arg>
 				</verify>
 			</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140418/fa9eb1a7/attachment.html>