<!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>[13887] 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/13887">13887</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-08-18 16:47:44 -0700 (Mon, 18 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds calendarserver-principal-search report</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfoxml">CalDAVTester/trunk/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVaclreportsxml">CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVaclreports35xml">CalDAVTester/trunk/Resource/CalDAV/aclreports/35.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVaclreports36xml">CalDAVTester/trunk/Resource/CalDAV/aclreports/36.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVaclreports35xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/aclreports/35.xml (0 => 13887)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/aclreports/35.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/aclreports/35.xml 2014-08-18 23:47:44 UTC (rev 13887)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<C:calendarserver-principal-search xmlns:C="http://calendarserver.org/ns/" context="location">
+ <C:search-token>loc</C:search-token>
+ <C:search-token>03</C:search-token>
+ <C:limit>
+ <C:nresults>50</C:nresults>
+ </C:limit>
+ <A:prop xmlns:A="DAV:">
+ <C:email-address-set/>
+ <C:last-name/>
+ <A:principal-URL/>
+ <A:displayname/>
+ <C:record-type/>
+ <C:first-name/>
+ <B:calendar-user-type xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:calendar-user-address-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ </A:prop>
+</C:calendarserver-principal-search>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVaclreports36xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/aclreports/36.xml (0 => 13887)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/aclreports/36.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/aclreports/36.xml 2014-08-18 23:47:44 UTC (rev 13887)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<C:calendarserver-principal-search xmlns:C="http://calendarserver.org/ns/" context="attendee">
+ <C:search-token>res</C:search-token>
+ <C:search-token>03</C:search-token>
+ <C:limit>
+ <C:nresults>50</C:nresults>
+ </C:limit>
+ <A:prop xmlns:A="DAV:">
+ <C:email-address-set/>
+ <C:last-name/>
+ <A:principal-URL/>
+ <A:displayname/>
+ <C:record-type/>
+ <C:first-name/>
+ <B:calendar-user-type xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:calendar-user-address-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ </A:prop>
+</C:calendarserver-principal-search>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml (13886 => 13887)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-08-18 20:59:28 UTC (rev 13886)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-08-18 23:47:44 UTC (rev 13887)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> <feature>principal-match REPORT</feature> <!-- ACL principal-match REPORT -->
</span><span class="cx"> <feature>principal-property-search REPORT</feature> <!-- ACL principal-property-search REPORT -->
</span><span class="cx"> <feature>principal-search-property-set REPORT</feature> <!-- ACL principal-search-property-set REPORT -->
</span><ins>+ <feature>calendarserver-principal-search REPORT</feature> <!-- ACL calendarserver-principal-search REPORT -->
</ins><span class="cx">
</span><span class="cx"> <feature>add-member</feature> <!-- Add-member used to create resources -->
</span><span class="cx"> <!-- <feature>auth-on-root</feature> --> <!-- Whether the server requires authentication on the root URI -->
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVaclreportsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml (13886 => 13887)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml 2014-08-18 20:59:28 UTC (rev 13886)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml 2014-08-18 23:47:44 UTC (rev 13887)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> <ruri>$calendarhome1:/calendar3/</ruri>
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='acl-principal-prop-set REPORT'>
</span><span class="cx">
</span><span class="cx"> <require-feature>
</span><span class="lines">@@ -186,7 +186,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='principal-match REPORT'>
</span><span class="cx">
</span><span class="cx"> <require-feature>
</span><span class="lines">@@ -808,7 +808,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='principal-search-property-set REPORT'>
</span><span class="cx">
</span><span class="cx"> <require-feature>
</span><span class="lines">@@ -899,7 +899,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='supported-report-set property'>
</span><span class="cx">
</span><span class="cx"> <test name='1'>
</span><span class="lines">@@ -1045,7 +1045,59 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
+ <test-suite name='calendarserver-principal-search REPORT'>
+
+ <require-feature>
+ <feature>calendarserver-principal-search REPORT</feature>
+ </require-feature>
+
+ <test name='1'>
+ <description>Valid ROOM displayname search report</description>
+ <request user='$useradmin:' pswd='$pswdadmin:'>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/aclreports/35.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$lprincipaluri3:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Valid RESOURCE displayname search report</description>
+ <request user='$useradmin:' pswd='$pswdadmin:'>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/aclreports/36.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$rprincipaluri3:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
</ins><span class="cx"> <end/>
</span><del>-
</del><ins>+
</ins><span class="cx"> </caldavtest>
</span></span></pre>
</div>
</div>
</body>
</html>