<!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>[13705] 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/13705">13705</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-30 07:53:12 -0700 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean-up CardDAV tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCardDAVverrors10xml">CalDAVTester/trunk/Resource/CardDAV/verrors/10.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVverrors11xml">CalDAVTester/trunk/Resource/CardDAV/verrors/11.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVverrors12xml">CalDAVTester/trunk/Resource/CardDAV/verrors/12.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVverrors13xml">CalDAVTester/trunk/Resource/CardDAV/verrors/13.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvnonascii2xml">CalDAVTester/trunk/Resource/CardDAV/vnonascii/2.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvnonascii3xml">CalDAVTester/trunk/Resource/CardDAV/vnonascii/3.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvnonascii4xml">CalDAVTester/trunk/Resource/CardDAV/vnonascii/4.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvnonascii5xml">CalDAVTester/trunk/Resource/CardDAV/vnonascii/5.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvreportsbasicquery2xml">CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/2.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvreportsbasicquery20xml">CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/20.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVaclreportsxml">CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVnonasciixml">CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVreportsxml">CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCardDAVsharingsyncaddressbook39xml">CalDAVTester/trunk/Resource/CardDAV/sharing/sync/addressbook/39.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvaclreports17xml">CalDAVTester/trunk/Resource/CardDAV/vaclreports/17.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvaclreports18xml">CalDAVTester/trunk/Resource/CardDAV/vaclreports/18.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvaclreports19xml">CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvaclreports20xml">CalDAVTester/trunk/Resource/CardDAV/vaclreports/20.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvaclreports21xml">CalDAVTester/trunk/Resource/CardDAV/vaclreports/21.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvaclreports22xml">CalDAVTester/trunk/Resource/CardDAV/vaclreports/22.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvaclreports23xml">CalDAVTester/trunk/Resource/CardDAV/vaclreports/23.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVvaclreports24xml">CalDAVTester/trunk/Resource/CardDAV/vaclreports/24.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCardDAVverrors16xml">CalDAVTester/trunk/Resource/CardDAV/verrors/16.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCardDAVsharingsyncaddressbook39xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/sharing/sync/addressbook/39.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/sharing/sync/addressbook/39.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/sync/addressbook/39.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:set>
-<D:prop>
-<C:schedule-default-calendar-URL><D:href>$calendarhome1:/synccalendar3/</D:href></C:schedule-default-calendar-URL>
-</D:prop>
-</D:set>
-</D:propertyupdate>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvaclreports17xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/17.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/17.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/17.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:supported-report-set/>
-</D:prop>
-</D:propfind>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvaclreports18xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/18.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/18.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/18.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-<?xml version='1.0' encoding='UTF-8'?>
-<principal-search-property-set xmlns='DAV:'>
- <principal-search-property>
- <prop>
- <calendar-user-type xmlns='urn:ietf:params:xml:ns:caldav'/>
- </prop>
- <description xml:lang='en'>Calendar User Type</description>
- </principal-search-property>
- <principal-search-property>
- <prop>
- <displayname/>
- </prop>
- <description xml:lang='en'>Display Name</description>
- </principal-search-property>
- <principal-search-property>
- <prop>
- <email-address xmlns='http://calendarserver.org/ns/'/>
- </prop>
- <description xml:lang='en'>Email Addresses</description>
- </principal-search-property>
- <principal-search-property>
- <prop>
- <first-name xmlns='http://calendarserver.org/ns/'/>
- </prop>
- <description xml:lang='en'>First Name</description>
- </principal-search-property>
- <principal-search-property>
- <prop>
- <last-name xmlns='http://calendarserver.org/ns/'/>
- </prop>
- <description xml:lang='en'>Last Name</description>
- </principal-search-property>
-</principal-search-property-set>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvaclreports19xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-<?xml version='1.0' encoding='UTF-8'?>
-<multistatus xmlns='DAV:'>
- <response>
- <href>$calendarpath1:/1.ics</href>
- <propstat>
- <prop>
- <supported-report-set>
- <supported-report>
- <report>
- <acl-principal-prop-set/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-match/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-property-search/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <expand-property/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <calendar-query xmlns='urn:ietf:params:xml:ns:caldav'/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <calendar-multiget xmlns='urn:ietf:params:xml:ns:caldav'/>
- </report>
- </supported-report>
- </supported-report-set>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvaclreports20xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/20.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/20.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/20.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-<?xml version='1.0' encoding='UTF-8'?>
-<multistatus xmlns='DAV:'>
- <response>
- <href>$principals:</href>
- <propstat>
- <prop>
- <supported-report-set>
- <supported-report>
- <report>
- <acl-principal-prop-set/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-match/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-property-search/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <expand-property/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <addressbook-query xmlns='urn:ietf:params:xml:ns:carddav'/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <addressbook-multiget xmlns='urn:ietf:params:xml:ns:carddav'/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <free-busy-query xmlns='urn:ietf:params:xml:ns:carddav'/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-search-property-set/>
- </report>
- </supported-report>
- </supported-report-set>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvaclreports21xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/21.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/21.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/21.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8" ?>
-<D:principal-property-search xmlns:D="DAV:" xmlns:c="http://calendarserver.org/ns/" test="allof" type="INDIVIDUAL">
- <D:apply-to-principal-collection-set/>
- <D:property-search>
- <D:prop>
- <c:first-name/>
- </D:prop>
- <D:match match-type="starts-with">appren</D:match>
- </D:property-search>
- <D:property-search>
- <D:prop>
- <c:last-name/>
- </D:prop>
- <D:match match-type="contains">uper</D:match>
- </D:property-search>
- <D:prop>
- <D:displayname/>
- <c:first-name/>
- <c:last-name/>
- <c:email-address-set/>
- </D:prop>
-</D:principal-property-search>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvaclreports22xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/22.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/22.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/22.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8" ?>
-<D:principal-property-search xmlns:D="DAV:" xmlns:c="http://calendarserver.org/ns/" test="anyof" type="INDIVIDUAL">
- <D:apply-to-principal-collection-set/>
- <D:property-search>
- <D:prop>
- <c:first-name/>
- </D:prop>
- <D:match match-type="starts-with">appren</D:match>
- </D:property-search>
- <D:property-search>
- <D:prop>
- <c:last-name/>
- </D:prop>
- <D:match match-type="contains">user</D:match>
- </D:property-search>
- <D:prop>
- <D:displayname/>
- <c:first-name/>
- <c:last-name/>
- <c:email-address-set/>
- </D:prop>
-</D:principal-property-search>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvaclreports23xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/23.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/23.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/23.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8" ?>
-<D:principal-property-search xmlns:D="DAV:" xmlns:c="http://calendarserver.org/ns/" test="anyof" type="ROOM">
- <D:apply-to-principal-collection-set/>
- <D:property-search>
- <D:prop>
- <D:displayname/>
- </D:prop>
- <D:match match-type="contains">03</D:match>
- </D:property-search>
- <D:prop>
- <D:displayname/>
- </D:prop>
-</D:principal-property-search>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvaclreports24xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/24.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/24.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/24.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8" ?>
-<D:principal-property-search xmlns:D="DAV:" xmlns:c="http://calendarserver.org/ns/" test="anyof" type="RESOURCE">
- <D:apply-to-principal-collection-set/>
- <D:property-search>
- <D:prop>
- <D:displayname/>
- </D:prop>
- <D:match match-type="contains">03</D:match>
- </D:property-search>
- <D:prop>
- <D:displayname/>
- </D:prop>
-</D:principal-property-search>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVverrors10xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/verrors/10.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/verrors/10.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/10.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -5,9 +5,6 @@
</span><span class="cx"> <C:address-data content-type="text/vcards" version="2.0"/>
</span><span class="cx"> </D:prop>
</span><span class="cx"> <C:filter>
</span><del>-<C:comp-filter name="NICKNAME">
-<C:comp-filter name="FN">
-</C:comp-filter>
-</C:comp-filter>
</del><ins>+<C:prop-filter name="NICKNAME" />
</ins><span class="cx"> </C:filter>
</span><span class="cx"> </C:addressbook-query>
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVverrors11xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/verrors/11.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/verrors/11.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/11.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -5,9 +5,6 @@
</span><span class="cx"> <C:address-data content-type="text/vcard" version="4.0"/>
</span><span class="cx"> </D:prop>
</span><span class="cx"> <C:filter>
</span><del>-<C:comp-filter name="NICKNAME">
-<C:comp-filter name="FN">
-</C:comp-filter>
-</C:comp-filter>
</del><ins>+<C:prop-filter name="NICKNAME" />
</ins><span class="cx"> </C:filter>
</span><span class="cx"> </C:addressbook-query>
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVverrors12xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/verrors/12.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/verrors/12.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/12.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -5,9 +5,6 @@
</span><span class="cx"> <C:address-data content-type="text/vcards" version="2.0"/>
</span><span class="cx"> </D:prop>
</span><span class="cx"> <C:filter>
</span><del>-<C:comp-filter name="NICKNAME">
-<C:comp-filter name="FN">
-</C:comp-filter>
-</C:comp-filter>
</del><ins>+<C:prop-filter name="NICKNAME"/>
</ins><span class="cx"> </C:filter>
</span><span class="cx"> </C:addressbook-multiget>
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVverrors13xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/verrors/13.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/verrors/13.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/13.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -5,9 +5,6 @@
</span><span class="cx"> <C:address-data content-type="text/vcard" version="4.0"/>
</span><span class="cx"> </D:prop>
</span><span class="cx"> <C:filter>
</span><del>-<C:comp-filter name="NICKNAME">
-<C:comp-filter name="FN">
-</C:comp-filter>
-</C:comp-filter>
</del><ins>+<C:prop-filter name="NICKNAME"/>
</ins><span class="cx"> </C:filter>
</span><span class="cx"> </C:addressbook-multiget>
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVverrors16xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CardDAV/verrors/16.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/verrors/16.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/16.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR">
-<C:comp-filter name="VALARM">
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvnonascii2xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/vnonascii/2.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vnonascii/2.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vnonascii/2.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -3,5 +3,5 @@
</span><span class="cx"> <D:prop>
</span><span class="cx"> <D:getetag/>
</span><span class="cx"> </D:prop>
</span><del>-<D:href>$calendarhome:/Tást/</D:href>
</del><ins>+<D:href>$addressbookhome:/Tást/</D:href>
</ins><span class="cx"> </C:addressbook-multiget>
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvnonascii3xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/vnonascii/3.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vnonascii/3.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vnonascii/3.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8" ?>
</span><del>-<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
</del><ins>+<C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
</ins><span class="cx"> <D:prop>
</span><span class="cx"> <D:getetag/>
</span><span class="cx"> </D:prop>
</span><del>-<D:href>$calendarhome1:/Te%cc%81st/t%c3%a9st.ics</D:href>
-</C:calendar-multiget>
</del><ins>+<D:href>$addressbookhome1:/Te%cc%81st/t%c3%a9st.ics</D:href>
+</C:addressbook-multiget>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvnonascii4xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/vnonascii/4.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vnonascii/4.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vnonascii/4.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8" ?>
</span><del>-<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
</del><ins>+<C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
</ins><span class="cx"> <D:prop>
</span><span class="cx"> <D:getetag/>
</span><span class="cx"> </D:prop>
</span><del>-<D:href>$calendarhome1:/T%c3%a9st/te%cc%81st.ics</D:href>
-</C:calendar-multiget>
</del><ins>+<D:href>$addressbookhome1:/T%c3%a9st/te%cc%81st.ics</D:href>
+</C:addressbook-multiget>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvnonascii5xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/vnonascii/5.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vnonascii/5.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vnonascii/5.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8" ?>
</span><del>-<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
</del><ins>+<C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
</ins><span class="cx"> <D:prop>
</span><span class="cx"> <D:getetag/>
</span><span class="cx"> </D:prop>
</span><del>-<D:href>$calendarhome1:/T%c3%a9st/t%c3%a9st.ics</D:href>
-</C:calendar-multiget>
</del><ins>+<D:href>$addressbookhome1:/T%c3%a9st/t%c3%a9st.ics</D:href>
+</C:addressbook-multiget>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvreportsbasicquery2xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/2.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/2.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/2.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -5,10 +5,8 @@
</span><span class="cx"> <C:address-data/>
</span><span class="cx"> </D:prop>
</span><span class="cx"> <C:filter>
</span><del>-<C:comp-filter name="UID">
-<C:comp-filter name="FN">
</del><ins>+<C:prop-filter name="PHOTO">
</ins><span class="cx"> <C:is-not-defined/>
</span><del>-</C:comp-filter>
-</C:comp-filter>
</del><ins>+</C:prop-filter>
</ins><span class="cx"> </C:filter>
</span><span class="cx"> </C:addressbook-query>
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCardDAVvreportsbasicquery20xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/20.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/20.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/20.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -5,11 +5,9 @@
</span><span class="cx"> <C:address-data/>
</span><span class="cx"> </D:prop>
</span><span class="cx"> <C:filter>
</span><del>-<C:comp-filter name="UID">
-<C:comp-filter name="FN">
</del><ins>+<C:prop-filter name="PHOTO">
</ins><span class="cx"> <C:is-not-defined/>
</span><del>-</C:comp-filter>
-</C:comp-filter>
</del><ins>+</C:prop-filter>
</ins><span class="cx"> </C:filter>
</span><span class="cx"> <C:limit>
</span><span class="cx"> <C:nresults>5</C:nresults>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVaclreportsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -650,92 +650,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <!--
- <test name='4'>
- <description>Valid report</description>
- <request>
- <method>REPORT</method>
- <ruri>$principalcollection:</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CardDAV/vaclreports/16.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <verify>
- <callback>dataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CardDAV/vaclreports/18.xml</value>
- </arg>
- </verify>
- </request>
- </test>
- -->
</del><span class="cx"> </test-suite>
</span><del>- <!--
- <test-suite name='supported-report-set property'>
- <test name='1'>
- <description>Regular resource</description>
- <request>
- <method>PROPFIND</method>
- <ruri>$addressbookpath1:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CardDAV/vaclreports/17.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>207</value>
- </arg>
- </verify>
- <verify>
- <callback>dataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CardDAV/vaclreports/19.xml</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='2'>
- <description>Regular resource</description>
- <request>
- <method>PROPFIND</method>
- <ruri>$principalcollection:</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CardDAV/vaclreports/17.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>207</value>
- </arg>
- </verify>
- <verify>
- <callback>dataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CardDAV/vaclreports/20.xml</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
- -->
</del><span class="cx"> <end/>
</span><span class="cx">
</span><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVnonasciixml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> <description>REPORT with non-ascii - match parent, different child</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>REPORT</method>
</span><del>- <ruri>$calendarhome1:/Tást/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/Tást/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/nonascii/3.xml</filepath>
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> <description>REPORT with non-ascii - different parent, match child</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>REPORT</method>
</span><del>- <ruri>$calendarhome1:/Te%cc%81st/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/Te%cc%81st/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/nonascii/4.xml</filepath>
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> <description>REPORT with non-ascii - different parent, different child</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>REPORT</method>
</span><del>- <ruri>$calendarhome1:/Te%cc%81st/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/Te%cc%81st/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/nonascii/5.xml</filepath>
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> <description>REPORT with non-ascii - match parent, match child</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>REPORT</method>
</span><del>- <ruri>$calendarhome1:/T%c3%a9st/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/T%c3%a9st/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/nonascii/2.xml</filepath>
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> <description>REPORT with non-ascii - match parent, different child</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>REPORT</method>
</span><del>- <ruri>$calendarhome1:/T%c3%a9st/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/T%c3%a9st/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/nonascii/3.xml</filepath>
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> <description>REPORT with non-ascii - different parent, match child</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>REPORT</method>
</span><del>- <ruri>$calendarhome1:/T%c3%a9st/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/T%c3%a9st/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/nonascii/4.xml</filepath>
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> <description>REPORT with non-ascii - different parent, different child</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>REPORT</method>
</span><del>- <ruri>$calendarhome1:/T%c3%a9st/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/T%c3%a9st/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/nonascii/5.xml</filepath>
</span><span class="lines">@@ -491,14 +491,14 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx"> <!--
</span><del>- <test-suite name='Copy/Move Non-utf-8 calendar data'>
</del><ins>+ <test-suite name='Copy/Move Non-utf-8 addressbook data'>
</ins><span class="cx"> <test name='1'>
</span><span class="cx"> <description>PUT with non-utf-8 data to regular collection</description>
</span><span class="cx"> <request end-delete="yes">
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$calendarhome1:/collection/nonutf8.ics</ruri>
</del><ins>+ <ruri>$addressbookhome1:/collection/nonutf8.ics</ruri>
</ins><span class="cx"> <data>
</span><del>- <content-type>text/calendar</content-type>
</del><ins>+ <content-type>text/vcard</content-type>
</ins><span class="cx"> <filepath>Resource/CardDAV/nonascii/10.ics</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -507,37 +507,37 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>COPY non-utf-8 data to calendar collection</description>
</del><ins>+ <description>COPY non-utf-8 data to addressbook collection</description>
</ins><span class="cx"> <request end-delete="yes">
</span><span class="cx"> <method>COPY</method>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Destination</name>
</span><del>- <value>$host:$calendarpath1:/copy1.ics</value>
</del><ins>+ <value>$host:$addressbookpath1:/copy1.ics</value>
</ins><span class="cx"> </header>
</span><del>- <ruri>$calendarhome1:/collection/nonutf8.ics</ruri>
</del><ins>+ <ruri>$addressbookhome1:/collection/nonutf8.ics</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>prepostcondition</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>error</name>
</span><del>- <value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
</del><ins>+ <value>{urn:ietf:params:xml:ns:caldav}valid-address-data</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='3'>
</span><del>- <description>MOVE non-utf-8 data to calendar collection</description>
</del><ins>+ <description>MOVE non-utf-8 data to addressbook collection</description>
</ins><span class="cx"> <request end-delete="yes">
</span><span class="cx"> <method>MOVE</method>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Destination</name>
</span><del>- <value>$host:$calendarpath1:/copy1.ics</value>
</del><ins>+ <value>$host:$addressbookpath1:/copy1.ics</value>
</ins><span class="cx"> </header>
</span><del>- <ruri>$calendarhome1:/collection/nonutf8.ics</ruri>
</del><ins>+ <ruri>$addressbookhome1:/collection/nonutf8.ics</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>prepostcondition</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>error</name>
</span><del>- <value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
</del><ins>+ <value>{urn:ietf:params:xml:ns:caldav}valid-address-data</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVreportsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml (13704 => 13705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml 2014-06-30 14:53:12 UTC (rev 13705)
</span><span class="lines">@@ -197,16 +197,10 @@
</span><span class="cx"> <value>3.vcf</value>
</span><span class="cx"> <value>4.vcf</value>
</span><span class="cx"> <value>5.vcf</value>
</span><del>- <value>6.vcf</value>
- <value>7.vcf</value>
</del><span class="cx"> <value>8.vcf</value>
</span><span class="cx"> <value>9.vcf</value>
</span><span class="cx"> <value>10.vcf</value>
</span><del>- <value>11.vcf</value>
- <value>12.vcf</value>
</del><span class="cx"> <value>13.vcf</value>
</span><del>- <value>14.vcf</value>
- <value>15.vcf</value>
</del><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -570,9 +564,9 @@
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>10.vcf</value>
</span><del>- <value>11.vcf</value>
- <value>12.vcf</value>
</del><span class="cx"> <value>13.vcf</value>
</span><ins>+ <value>2.vcf</value>
+ <value>3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span></span></pre>
</div>
</div>
</body>
</html>