<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13165] CalDAVTester/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13165">13165</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-04 12:38:27 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>landing move2who-cdt branch to trunk</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCardDAVvreportssearchquery16xml">CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfopodxml">CalDAVTester/trunk/scripts/server/serverinfo-pod.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfotemplatexml">CalDAVTester/trunk/scripts/server/serverinfo-template.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfoxml">CalDAVTester/trunk/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVdirectoryxml">CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVdirectoryxml">CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVreportsxml">CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml</a></li>
<li><a href="#CalDAVTestertrunksetuppy">CalDAVTester/trunk/setup.py</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#CalDAVTestertrunk">CalDAVTester/trunk/</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAV">CalDAVTester/trunk/Resource/CardDAV/</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAV">CalDAVTester/trunk/scripts/tests/CardDAV/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunk"></a>
<div class="propset"><h4>Property changes: CalDAVTester/trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204
</span><span class="cx"> + /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584
</span><span class="cx">/CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-cdt:13094-13164
</span><a id="CalDAVTestertrunkResourceCardDAV"></a>
<div class="propset"><h4>Property changes: CalDAVTester/trunk/Resource/CardDAV</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CardDAV:10193
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/CardDAV:2888-2910
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/CardDAV:3149-3163
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CardDAV:8221-8346
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/conditional-4466/Resource/CardDAV:4467-4469
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/CardDAV:2949-2989
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/CardDAV:3575-3581
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CardDAV:9986-10145
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/CardDAV:3534-3558
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV:7160-7206
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycard/Resource/CardDAV:7226-7237
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CardDAV:5229-5440
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV:11078-11181
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV:11181-11204
</span><span class="cx"> + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CardDAV:7584
</span><span class="cx">/CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CardDAV:10193
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/CardDAV:2888-2910
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/CardDAV:3149-3163
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CardDAV:8221-8346
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/conditional-4466/Resource/CardDAV:4467-4469
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/CardDAV:2949-2989
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/CardDAV:3575-3581
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CardDAV:9986-10145
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/CardDAV:3534-3558
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV:7160-7206
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycard/Resource/CardDAV:7226-7237
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CardDAV:5229-5440
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV:11078-11181
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV:11181-11204
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-cdt/Resource/CardDAV:13094-13164
</span><a id="CalDAVTestertrunkResourceCardDAVvreportssearchquery16xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml (13164 => 13165)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml 2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml 2014-04-04 19:38:27 UTC (rev 13165)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> <C:prop-filter name="X-ADDRESSBOOKSERVER-MEMBER">
</span><span class="cx"> <C:text-match collation="i;unicode-casemap"
</span><span class="cx"> match-type="contains"
</span><del>- >group</C:text-match>
</del><ins>+ >$groupguid3:</C:text-match>
</ins><span class="cx"> </C:prop-filter>
</span><span class="cx"> </C:filter>
</span><span class="cx"> </C:addressbook-query>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfopodxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml (13164 => 13165)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-04-04 19:38:27 UTC (rev 13165)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> <sslport2>8543</sslport2>
</span><span class="cx">
</span><span class="cx"> <authtype>basic</authtype>
</span><del>-
</del><ins>+
</ins><span class="cx"> <waitcount>120</waitcount>
</span><span class="cx"> <waitdelay>0.25</waitdelay>
</span><span class="cx">
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> <feature>COPY Method</feature> <!-- COPY method -->
</span><span class="cx"> <feature>MOVE Method</feature> <!-- MOVE method -->
</span><span class="cx"> <feature>Extended MKCOL</feature> <!-- Extended MKCOL -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- ACL related -->
</span><span class="cx"> <feature>ACL Method</feature> <!-- ACL method -->
</span><span class="cx"> <feature>acl-principal-prop-set REPORT</feature> <!-- ACL acl-principal-prop-set REPORT -->
</span><span class="lines">@@ -233,10 +233,6 @@
</span><span class="cx"> <value>$calendars:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$calendars_groups:</key>
- <value>$calendars:$groupstype:/</value>
- </substitution>
- <substitution>
</del><span class="cx"> <key>$calendars_resources:</key>
</span><span class="cx"> <value>$calendars:$resourcestype:/</value>
</span><span class="cx"> </substitution>
</span><span class="lines">@@ -326,10 +322,6 @@
</span><span class="cx"> <key>$addressbooks_users:</key>
</span><span class="cx"> <value>$addressbooks:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><del>- <substitution>
- <key>$addressbooks_groups:</key>
- <value>$addressbooks:$groupstype:/</value>
- </substitution>
</del><span class="cx">
</span><span class="cx"> <!-- primary addressbook name -->
</span><span class="cx"> <substitution>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfotemplatexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml (13164 => 13165)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-04-04 19:38:27 UTC (rev 13165)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> <nonsslport>%(nonsslport)s</nonsslport>
</span><span class="cx"> <sslport>%(sslport)s</sslport>
</span><span class="cx"> <authtype>%(authtype)s</authtype>
</span><del>-
</del><ins>+
</ins><span class="cx"> <waitcount>120</waitcount>
</span><span class="cx"> <waitdelay>0.25</waitdelay>
</span><span class="cx">
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> <feature>COPY Method</feature> <!-- COPY method -->
</span><span class="cx"> <feature>MOVE Method</feature> <!-- MOVE method -->
</span><span class="cx"> <feature>Extended MKCOL</feature> <!-- Extended MKCOL -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- ACL related -->
</span><span class="cx"> <feature>ACL Method</feature> <!-- ACL method -->
</span><span class="cx"> <feature>acl-principal-prop-set REPORT</feature> <!-- ACL acl-principal-prop-set REPORT -->
</span><span class="lines">@@ -228,10 +228,6 @@
</span><span class="cx"> <value>$calendars:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$calendars_groups:</key>
- <value>$calendars:$groupstype:/</value>
- </substitution>
- <substitution>
</del><span class="cx"> <key>$calendars_resources:</key>
</span><span class="cx"> <value>$calendars:$resourcestype:/</value>
</span><span class="cx"> </substitution>
</span><span class="lines">@@ -321,10 +317,6 @@
</span><span class="cx"> <key>$addressbooks_users:</key>
</span><span class="cx"> <value>$addressbooks:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><del>- <substitution>
- <key>$addressbooks_groups:</key>
- <value>$addressbooks:$groupstype:/</value>
- </substitution>
</del><span class="cx">
</span><span class="cx"> <!-- primary addressbook name -->
</span><span class="cx"> <substitution>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml (13164 => 13165)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-04-04 19:38:27 UTC (rev 13165)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> <nonsslport>8008</nonsslport>
</span><span class="cx"> <sslport>8443</sslport>
</span><span class="cx"> <authtype>basic</authtype>
</span><del>-
</del><ins>+
</ins><span class="cx"> <waitcount>120</waitcount>
</span><span class="cx"> <waitdelay>0.25</waitdelay>
</span><span class="cx">
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> <feature>COPY Method</feature> <!-- COPY method -->
</span><span class="cx"> <feature>MOVE Method</feature> <!-- MOVE method -->
</span><span class="cx"> <feature>Extended MKCOL</feature> <!-- Extended MKCOL -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- ACL related -->
</span><span class="cx"> <feature>ACL Method</feature> <!-- ACL method -->
</span><span class="cx"> <feature>acl-principal-prop-set REPORT</feature> <!-- ACL acl-principal-prop-set REPORT -->
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <feature>carddav</feature> <!-- Basic CardDAV feature enabler -->
</span><span class="cx"> <feature>default-addressbook</feature> <!-- Default address book behavior -->
</span><span class="cx"> <feature>shared-addressbooks</feature> <!-- Shared address books extension -->
</span><del>- <!-- <feature>directory-gateway</feature> --> <!-- Directory gateway extension -->
</del><ins>+ <feature>directory-gateway</feature> <!-- Directory gateway extension -->
</ins><span class="cx">
</span><span class="cx"> </features>
</span><span class="cx">
</span><span class="lines">@@ -228,10 +228,6 @@
</span><span class="cx"> <value>$calendars:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$calendars_groups:</key>
- <value>$calendars:$groupstype:/</value>
- </substitution>
- <substitution>
</del><span class="cx"> <key>$calendars_resources:</key>
</span><span class="cx"> <value>$calendars:$resourcestype:/</value>
</span><span class="cx"> </substitution>
</span><span class="lines">@@ -327,10 +323,6 @@
</span><span class="cx"> <key>$addressbooks_users:</key>
</span><span class="cx"> <value>$addressbooks:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><del>- <substitution>
- <key>$addressbooks_groups:</key>
- <value>$addressbooks:$groupstype:/</value>
- </substitution>
</del><span class="cx">
</span><span class="cx"> <!-- primary addressbook name -->
</span><span class="cx"> <substitution>
</span><span class="lines">@@ -358,7 +350,7 @@
</span><span class="cx"> <!-- guid for admin user -->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$useradminguid:</key>
</span><del>- <value>admin</value>
</del><ins>+ <value>0C8BDE62-E600-4696-83D3-8B5ECABDFD2E</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- password for admin user -->
</span><span class="cx"> <substitution>
</span><span class="lines">@@ -384,7 +376,7 @@
</span><span class="cx"> <!-- guid for apprentice user -->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$userapprenticeguid:</key>
</span><del>- <value>apprentice</value>
</del><ins>+ <value>29B6C503-11DF-43EC-8CCA-40C7003149CE</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- password for admin user -->
</span><span class="cx"> <substitution>
</span><span class="lines">@@ -423,7 +415,7 @@
</span><span class="cx"> <!-- user guid -->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$userguid%d:</key>
</span><del>- <value>user%02d</value>
</del><ins>+ <value>10000000-0000-0000-0000-000000000%03d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- user name -->
</span><span class="cx"> <substitution>
</span><span class="lines">@@ -563,7 +555,7 @@
</span><span class="cx"> <!-- user guid -->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$publicuserguid%d:</key>
</span><del>- <value>public%02d</value>
</del><ins>+ <value>50000000-0000-0000-0000-0000000000%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- user name -->
</span><span class="cx"> <substitution>
</span><span class="lines">@@ -622,7 +614,7 @@
</span><span class="cx"> <!-- resource guid-->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$resourceguid%d:</key>
</span><del>- <value>resource%02d</value>
</del><ins>+ <value>40000000-0000-0000-0000-000000000%03d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- resource name-->
</span><span class="cx"> <substitution>
</span><span class="lines">@@ -677,7 +669,7 @@
</span><span class="cx"> <!-- location guid-->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$locationguid%d:</key>
</span><del>- <value>location%02d</value>
</del><ins>+ <value>30000000-0000-0000-0000-000000000%03d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- location name-->
</span><span class="cx"> <substitution>
</span><span class="lines">@@ -733,7 +725,7 @@
</span><span class="cx"> <!-- group guid-->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$groupguid%d:</key>
</span><del>- <value>group%02d</value>
</del><ins>+ <value>20000000-0000-0000-0000-000000000%03d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- group name-->
</span><span class="cx"> <substitution>
</span><span class="lines">@@ -767,7 +759,7 @@
</span><span class="cx"> <!-- group guid-->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$i18nguid:</key>
</span><del>- <value>i18nuser</value>
</del><ins>+ <value>860B3EE9-6D7C-4296-9639-E6B998074A78</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- group name-->
</span><span class="cx"> <substitution>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVdirectoryxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml (13164 => 13165)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml 2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml 2014-04-04 19:38:27 UTC (rev 13165)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> </require-feature>
</span><span class="cx">
</span><span class="cx"> <start/>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='GET on collections'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>GET on root collection</description>
</span><span class="lines">@@ -124,16 +124,6 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='10'>
</span><del>- <description>GET on group calendars collection</description>
- <request>
- <method>GET</method>
- <ruri>$calendars_groups:</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='11'>
</del><span class="cx"> <description>GET on locations calendars collection</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -143,7 +133,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='12'>
</del><ins>+ <test name='11'>
</ins><span class="cx"> <description>GET on resources calendars collection</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -153,7 +143,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13'>
</del><ins>+ <test name='12'>
</ins><span class="cx"> <description>GET on __uids__ calendars collection</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -168,7 +158,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <end/>
</span><del>-
</del><ins>+
</ins><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAV"></a>
<div class="propset"><h4>Property changes: CalDAVTester/trunk/scripts/tests/CardDAV</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalDAVTester/branches/release/CalDAVTester-4.3-dev/scripts/tests/CardDAV:10193
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/scripts/tests/CardDAV:2888-2910
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/CardDAV:3149-3163
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CardDAV:8221-8346
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/CardDAV:4467-4469
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/CardDAV:2949-2989
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/scripts/tests/CardDAV:3575-3581
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/tests/CardDAV:9986-10145
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/CardDAV:3534-3558
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV:7160-7206
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycard/scripts/tests/CardDAV:7226-7237
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CardDAV:5229-5440
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV:11078-11181
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV:11181-11204
</span><span class="cx"> + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CardDAV:7584
</span><span class="cx">/CalDAVTester/branches/release/CalDAVTester-4.3-dev/scripts/tests/CardDAV:10193
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/scripts/tests/CardDAV:2888-2910
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/CardDAV:3149-3163
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CardDAV:8221-8346
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/CardDAV:4467-4469
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/CardDAV:2949-2989
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/scripts/tests/CardDAV:3575-3581
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/tests/CardDAV:9986-10145
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/CardDAV:3534-3558
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV:7160-7206
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/pycard/scripts/tests/CardDAV:7226-7237
</span><span class="cx">/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CardDAV:5229-5440
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV:11078-11181
</span><span class="cx">/CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV:11181-11204
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV:13094-13164
</span><a id="CalDAVTestertrunkscriptstestsCardDAVdirectoryxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml (13164 => 13165)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml 2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml 2014-04-04 19:38:27 UTC (rev 13165)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx"> <caldavtest>
</span><span class="cx"> <description>Test GET on collections to ensure proper directory listing</description>
</span><del>-
</del><ins>+
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>carddav</feature>
</span><span class="cx"> </require-feature>
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- </test>
</del><ins>+ </test>
</ins><span class="cx"> <test name='5'>
</span><span class="cx"> <description>GET on __uids__ principals collection</description>
</span><span class="cx"> <request>
</span><span class="lines">@@ -103,16 +103,6 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><del>- <description>GET on group addressbooks collection</description>
- <request>
- <method>GET</method>
- <ruri>$addressbooks_groups:</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='9'>
</del><span class="cx"> <description>GET on __uids__ addressbooks collection</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -129,5 +119,5 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <end/>
</span><del>-
</del><ins>+
</ins><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVreportsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml (13164 => 13165)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml 2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml 2014-04-04 19:38:27 UTC (rev 13165)
</span><span class="lines">@@ -1326,16 +1326,28 @@
</span><span class="cx"> <value>$groupguid4:.vcf</value>
</span><span class="cx"> <value>$groupguid5:.vcf</value>
</span><span class="cx"> <value>$groupguid6:.vcf</value>
</span><ins>+ <value>$groupguid7:.vcf</value>
+ <value>$groupguid8:.vcf</value>
+ <value>$groupguid9:.vcf</value>
+ <value>$groupguid10:.vcf</value>
+ <value>$groupguid20:.vcf</value>
+ <value>$groupguid30:.vcf</value>
+ <value>$groupguid40:.vcf</value>
+ <value>$groupguid50:.vcf</value>
+ <value>$groupguid60:.vcf</value>
+ <value>$groupguid70:.vcf</value>
+ <value>$groupguid80:.vcf</value>
+ <value>$groupguid90:.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>totalcount</name>
</span><del>- <value>7</value>
</del><ins>+ <value>19</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name="16" ignore="no">
</span><del>- <description>query for resources with (KIND equal "group") and (X-ADDRESSBOOKSERVER-MEMBER contains "group"), no eTag, no props " </description>
</del><ins>+ <description>query for resources with (KIND equal "group") and (X-ADDRESSBOOKSERVER-MEMBER contains $groupguid3:), no eTag, no props " </description>
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$directory:</ruri>
</span><span class="lines">@@ -1348,11 +1360,10 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$groupguid4:.vcf</value>
</span><del>- <value>$groupguid5:.vcf</value>
</del><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>totalcount</name>
</span><del>- <value>2</value>
</del><ins>+ <value>1</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml (13164 => 13165)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2014-04-04 19:38:27 UTC (rev 13165)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
</span><span class="cx"> <test-suite name='shared addressbook'>
</span><span class="cx"> <test name='1a'>
</span><span class="lines">@@ -2231,7 +2231,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
</span><span class="cx"> <test-suite name='two shared groups'>
</span><span class="cx"> <test name='0'>
</span><span class="lines">@@ -3584,9 +3584,9 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <!-- test suites below are similar to those in ../CalDAV/sync-report.xml but
</del><ins>+ <!-- test suites below are similar to those in ../CalDAV/sync-report.xml but
</ins><span class="cx"> use shared address books instead of calendars -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='support-report-set/sync-token property'>
</span><span class="cx"> <test name='0'>
</span><span class="cx"> <description>clean up old data</description>
</span><span class="lines">@@ -3598,7 +3598,7 @@
</span><span class="cx"> <ruri>$addressbookhome4:/</ruri>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="cx"> </request>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- add 2 vcards to user1 address book -->
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -3616,7 +3616,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/2.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- share user2 address book with user1 -->
</span><span class="cx"> <!-- user2 POSTs invitation -->
</span><span class="cx"> <request user="$userid2:" pswd="$pswd2:" print-response="no">
</span><span class="lines">@@ -3803,7 +3803,7 @@
</span><span class="cx"> <description>On shared addressbook</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><del>- <ruri>$addressbookhome1:/$userid2:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid2:/</ruri>
</ins><span class="cx"> <header>
</span><span class="cx"> <name>Depth</name>
</span><span class="cx"> <value>0</value>
</span><span class="lines">@@ -3845,7 +3845,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='simple reports - sync-level'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <require-feature>
</span><span class="lines">@@ -3868,7 +3868,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3894,7 +3894,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3920,7 +3920,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3948,10 +3948,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3979,10 +3979,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4010,10 +4010,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4240,7 +4240,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4268,10 +4268,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4335,7 +4335,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4364,10 +4364,10 @@
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="cx"> <value>$addressbook:/3.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4426,7 +4426,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4454,10 +4454,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4520,7 +4520,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4548,10 +4548,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -5197,7 +5197,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/6.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- share user4 address book with user1 -->
</span><span class="cx"> <!-- user4 POSTs invitation -->
</span><span class="cx"> <request user="$userid4:" pswd="$pswd4:" print-response="no">
</span><span class="lines">@@ -5273,14 +5273,14 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/1.vcf</value>
- <value>$userid3:/2.vcf</value>
- <value>$userid3:/addressbook.vcf</value>
- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
- <value>$userid4:/2.vcf</value>
- <value>$userid4:/addressbook.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/1.vcf</value>
+ <value>$userguid3:/2.vcf</value>
+ <value>$userguid3:/addressbook.vcf</value>
+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
+ <value>$userguid4:/2.vcf</value>
+ <value>$userguid4:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5293,7 +5293,7 @@
</span><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/9.vcf</filepath>
</span><span class="lines">@@ -5317,8 +5317,8 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/3.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5331,7 +5331,7 @@
</span><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -5351,11 +5351,11 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid3:/3.vcf</value>
</del><ins>+ <value>$userguid3:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -5377,11 +5377,11 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid3:/3.vcf</value>
</del><ins>+ <value>$userguid3:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5394,7 +5394,7 @@
</span><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/1.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/5.vcf</filepath>
</span><span class="lines">@@ -5418,8 +5418,8 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/1.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/1.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5474,14 +5474,14 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/1.vcf</value>
- <value>$userid3:/2.vcf</value>
- <value>$userid3:/addressbook.vcf</value>
- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
- <value>$userid4:/2.vcf</value>
- <value>$userid4:/addressbook.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/1.vcf</value>
+ <value>$userguid3:/2.vcf</value>
+ <value>$userguid3:/addressbook.vcf</value>
+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
+ <value>$userguid4:/2.vcf</value>
+ <value>$userguid4:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5502,7 +5502,7 @@
</span><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/12.vcf</filepath>
</span><span class="lines">@@ -5526,8 +5526,8 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
- <value>$userid4:/3.vcf</value>
</del><ins>+ <value>$userguid4:/</value>
+ <value>$userguid4:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5548,7 +5548,7 @@
</span><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -5568,11 +5568,11 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid4:/3.vcf</value>
</del><ins>+ <value>$userguid4:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -5594,11 +5594,11 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid4:/3.vcf</value>
</del><ins>+ <value>$userguid4:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5618,7 +5618,7 @@
</span><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/1.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/7.vcf</filepath>
</span><span class="lines">@@ -5642,8 +5642,8 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
</del><ins>+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5714,12 +5714,12 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/1.vcf</value>
- <value>$userid3:/2.vcf</value>
- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
- <value>$userid4:/2.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/1.vcf</value>
+ <value>$userguid3:/2.vcf</value>
+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
+ <value>$userguid4:/2.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5773,7 +5773,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5837,7 +5837,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -5859,7 +5859,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5869,7 +5869,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='simple reports - diff token - no props - home depth:1'>
</span><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="lines">@@ -5941,7 +5941,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/6.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- share user4 address book with user1 -->
</span><span class="cx"> <!-- user4 POSTs invitation -->
</span><span class="cx"> <request user="$userid4:" pswd="$pswd4:" print-response="no">
</span><span class="lines">@@ -6017,8 +6017,8 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid4:/</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6031,7 +6031,7 @@
</span><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/9.vcf</filepath>
</span><span class="lines">@@ -6055,7 +6055,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6068,7 +6068,7 @@
</span><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -6088,7 +6088,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -6110,7 +6110,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6123,7 +6123,7 @@
</span><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/1.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/5.vcf</filepath>
</span><span class="lines">@@ -6147,7 +6147,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6202,8 +6202,8 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid4:/</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6224,7 +6224,7 @@
</span><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/10.vcf</filepath>
</span><span class="lines">@@ -6248,7 +6248,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6269,7 +6269,7 @@
</span><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -6289,7 +6289,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -6311,7 +6311,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6331,7 +6331,7 @@
</span><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/1.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/7.vcf</filepath>
</span><span class="lines">@@ -6355,7 +6355,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6426,8 +6426,8 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid4:/</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6440,21 +6440,21 @@
</span><span class="cx"> <description>remove resource then addressbook</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/1.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/2.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/2.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -6474,7 +6474,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6540,7 +6540,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -6562,7 +6562,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -6616,12 +6616,12 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/addressbook.vcf</value>
- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
- <value>$userid4:/2.vcf</value>
- <value>$userid4:/addressbook.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/addressbook.vcf</value>
+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
+ <value>$userguid4:/2.vcf</value>
+ <value>$userguid4:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6634,7 +6634,7 @@
</span><span class="cx"> <description>Change a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/sync/addressbook/37.xml</filepath>
</span><span class="lines">@@ -6658,7 +6658,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6678,7 +6678,7 @@
</span><span class="cx"> <description>Remove a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/sync/addressbook/38.xml</filepath>
</span><span class="lines">@@ -6702,7 +6702,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6742,8 +6742,8 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid4:/</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6756,7 +6756,7 @@
</span><span class="cx"> <description>Change a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/sync/addressbook/37.xml</filepath>
</span><span class="lines">@@ -6780,7 +6780,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6800,7 +6800,7 @@
</span><span class="cx"> <description>Remove a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/sync/addressbook/38.xml</filepath>
</span><span class="lines">@@ -6824,7 +6824,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6855,5 +6855,5 @@
</span><span class="cx"> <ruri>$notificationpath4:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx"> </end>
</span><del>-
</del><ins>+
</ins><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalDAVTestertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/setup.py (13164 => 13165)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/setup.py 2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/setup.py 2014-04-04 19:38:27 UTC (rev 13165)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx">
</span><span class="cx"> break
</span><span class="cx"> else:
</span><ins>+ full_version = base_version
</ins><span class="cx"> full_version += "a.unknown"
</span><span class="cx"> full_version += "-r{revision}".format(revision=svn_revision)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>