
<!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>[12880] CalendarServer/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/12880">12880</a></dd>

<dt>Author</dt> <dd>cdaboo@apple.com</dd>

<dt>Date</dt> <dd>2014-03-12 11:28:29 -0700 (Wed, 12 Mar 2014)</dd>

</dl>


<h3>Log Message</h3>

<pre>Make xml directory use the default recordForCalendarUserAddress implementation to catch any errors in that.</pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#CalendarServertrunkconfauthresourcestestxml">CalendarServer/trunk/conf/auth/resources-test.xml</a></li>

<li><a href="#CalendarServertrunktwistedcaldavdirectoryxmlfilepy">CalendarServer/trunk/twistedcaldav/directory/xmlfile.py</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="CalendarServertrunkconfauthresourcestestxml"></a>

<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/resources-test.xml (12879 => 12880)</h4>

<pre class="diff"><span>

<span class="info">--- CalendarServer/trunk/conf/auth/resources-test.xml        2014-03-12 18:24:06 UTC (rev 12879)

+++ CalendarServer/trunk/conf/auth/resources-test.xml        2014-03-12 18:28:29 UTC (rev 12880)

</span><span class="lines">@@ -1,4 +1,16 @@

</span><span class="cx"> &lt;accounts realm=&quot;Test Realm&quot;&gt;

</span><ins>+  &lt;location repeat=&quot;10&quot;&gt;

+    &lt;uid&gt;location%02d&lt;/uid&gt;

+    &lt;guid&gt;location%02d&lt;/guid&gt;

+    &lt;password&gt;location%02d&lt;/password&gt;

+    &lt;name&gt;Room %02d&lt;/name&gt;

+  &lt;/location&gt;

+  &lt;resource repeat=&quot;20&quot;&gt;

+    &lt;uid&gt;resource%02d&lt;/uid&gt;

+    &lt;guid&gt;resource%02d&lt;/guid&gt;

+    &lt;password&gt;resource%02d&lt;/password&gt;

+    &lt;name&gt;Resource %02d&lt;/name&gt;

+  &lt;/resource&gt;

</ins><span class="cx">   &lt;location&gt;

</span><span class="cx">     &lt;uid&gt;fantastic&lt;/uid&gt;

</span><span class="cx">     &lt;guid&gt;4D66A20A-1437-437D-8069-2F14E8322234&lt;/guid&gt;

</span><span class="lines">@@ -28,51 +40,6 @@

</span><span class="cx">     &lt;name&gt;Mercury Conference Room, Building 1, 2nd Floor&lt;/name&gt;

</span><span class="cx">   &lt;/location&gt;

</span><span class="cx">   &lt;location&gt;

</span><del>-    &lt;uid&gt;location09&lt;/uid&gt;

-    &lt;guid&gt;location09&lt;/guid&gt;

-    &lt;name&gt;Room 09&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

-    &lt;uid&gt;location08&lt;/uid&gt;

-    &lt;guid&gt;location08&lt;/guid&gt;

-    &lt;name&gt;Room 08&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

-    &lt;uid&gt;location07&lt;/uid&gt;

-    &lt;guid&gt;location07&lt;/guid&gt;

-    &lt;name&gt;Room 07&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

-    &lt;uid&gt;location06&lt;/uid&gt;

-    &lt;guid&gt;location06&lt;/guid&gt;

-    &lt;name&gt;Room 06&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

-    &lt;uid&gt;location05&lt;/uid&gt;

-    &lt;guid&gt;location05&lt;/guid&gt;

-    &lt;name&gt;Room 05&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

-    &lt;uid&gt;location04&lt;/uid&gt;

-    &lt;guid&gt;location04&lt;/guid&gt;

-    &lt;name&gt;Room 04&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

-    &lt;uid&gt;location03&lt;/uid&gt;

-    &lt;guid&gt;location03&lt;/guid&gt;

-    &lt;name&gt;Room 03&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

-    &lt;uid&gt;location02&lt;/uid&gt;

-    &lt;guid&gt;location02&lt;/guid&gt;

-    &lt;name&gt;Room 02&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

-    &lt;uid&gt;location01&lt;/uid&gt;

-    &lt;guid&gt;location01&lt;/guid&gt;

-    &lt;name&gt;Room 01&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

</del><span class="cx">     &lt;uid&gt;delegatedroom&lt;/uid&gt;

</span><span class="cx">     &lt;guid&gt;delegatedroom&lt;/guid&gt;

</span><span class="cx">     &lt;name&gt;Delegated Conference Room&lt;/name&gt;

</span><span class="lines">@@ -101,11 +68,6 @@

</span><span class="cx">     &lt;name&gt;Saturn Conference Room, Building 2, 1st Floor&lt;/name&gt;

</span><span class="cx">   &lt;/location&gt;

</span><span class="cx">   &lt;location&gt;

</span><del>-    &lt;uid&gt;location10&lt;/uid&gt;

-    &lt;guid&gt;location10&lt;/guid&gt;

-    &lt;name&gt;Room 10&lt;/name&gt;

-  &lt;/location&gt;

-  &lt;location&gt;

</del><span class="cx">     &lt;uid&gt;pretend&lt;/uid&gt;

</span><span class="cx">     &lt;guid&gt;06E3BDCB-9C19-485A-B14E-F146A80ADDC6&lt;/guid&gt;

</span><span class="cx">     &lt;name&gt;Pretend Conference Room&lt;/name&gt;

</span><span class="lines">@@ -134,115 +96,15 @@

</span><span class="cx">     &lt;name&gt;Shari's Other Resource&lt;/name&gt;

</span><span class="cx">   &lt;/resource&gt;

</span><span class="cx">   &lt;resource&gt;

</span><del>-    &lt;uid&gt;resource15&lt;/uid&gt;

-    &lt;guid&gt;resource15&lt;/guid&gt;

-    &lt;name&gt;Resource 15&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource14&lt;/uid&gt;

-    &lt;guid&gt;resource14&lt;/guid&gt;

-    &lt;name&gt;Resource 14&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource17&lt;/uid&gt;

-    &lt;guid&gt;resource17&lt;/guid&gt;

-    &lt;name&gt;Resource 17&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource16&lt;/uid&gt;

-    &lt;guid&gt;resource16&lt;/guid&gt;

-    &lt;name&gt;Resource 16&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource11&lt;/uid&gt;

-    &lt;guid&gt;resource11&lt;/guid&gt;

-    &lt;name&gt;Resource 11&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource10&lt;/uid&gt;

-    &lt;guid&gt;resource10&lt;/guid&gt;

-    &lt;name&gt;Resource 10&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource13&lt;/uid&gt;

-    &lt;guid&gt;resource13&lt;/guid&gt;

-    &lt;name&gt;Resource 13&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource12&lt;/uid&gt;

-    &lt;guid&gt;resource12&lt;/guid&gt;

-    &lt;name&gt;Resource 12&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource19&lt;/uid&gt;

-    &lt;guid&gt;resource19&lt;/guid&gt;

-    &lt;name&gt;Resource 19&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource18&lt;/uid&gt;

-    &lt;guid&gt;resource18&lt;/guid&gt;

-    &lt;name&gt;Resource 18&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

</del><span class="cx">     &lt;uid&gt;sharisresource&lt;/uid&gt;

</span><span class="cx">     &lt;guid&gt;C38BEE7A-36EE-478C-9DCB-CBF4612AFE65&lt;/guid&gt;

</span><span class="cx">     &lt;name&gt;Shari's Resource&lt;/name&gt;

</span><span class="cx">   &lt;/resource&gt;

</span><span class="cx">   &lt;resource&gt;

</span><del>-    &lt;uid&gt;resource20&lt;/uid&gt;

-    &lt;guid&gt;resource20&lt;/guid&gt;

-    &lt;name&gt;Resource 20&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource06&lt;/uid&gt;

-    &lt;guid&gt;resource06&lt;/guid&gt;

-    &lt;name&gt;Resource 06&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource07&lt;/uid&gt;

-    &lt;guid&gt;resource07&lt;/guid&gt;

-    &lt;name&gt;Resource 07&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource04&lt;/uid&gt;

-    &lt;guid&gt;resource04&lt;/guid&gt;

-    &lt;name&gt;Resource 04&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource05&lt;/uid&gt;

-    &lt;guid&gt;resource05&lt;/guid&gt;

-    &lt;name&gt;Resource 05&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource02&lt;/uid&gt;

-    &lt;guid&gt;resource02&lt;/guid&gt;

-    &lt;name&gt;Resource 02&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource03&lt;/uid&gt;

-    &lt;guid&gt;resource03&lt;/guid&gt;

-    &lt;name&gt;Resource 03&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource01&lt;/uid&gt;

-    &lt;guid&gt;resource01&lt;/guid&gt;

-    &lt;name&gt;Resource 01&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

</del><span class="cx">     &lt;uid&gt;sharisotherresource1&lt;/uid&gt;

</span><span class="cx">     &lt;guid&gt;0CE0BF31-5F9E-4801-A489-8C70CF287F5F&lt;/guid&gt;

</span><span class="cx">     &lt;name&gt;Shari's Other Resource1&lt;/name&gt;

</span><span class="cx">   &lt;/resource&gt;

</span><del>-  &lt;resource&gt;

-    &lt;uid&gt;resource08&lt;/uid&gt;

-    &lt;guid&gt;resource08&lt;/guid&gt;

-    &lt;name&gt;Resource 08&lt;/name&gt;

-  &lt;/resource&gt;

-  &lt;resource&gt;

-    &lt;uid&gt;resource09&lt;/uid&gt;

-    &lt;guid&gt;resource09&lt;/guid&gt;

-    &lt;name&gt;Resource 09&lt;/name&gt;

-  &lt;/resource&gt;

</del><span class="cx">   &lt;address&gt;

</span><span class="cx">     &lt;uid&gt;testaddress1&lt;/uid&gt;

</span><span class="cx">     &lt;guid&gt;6F9EE33B-78F6-481B-9289-3D0812FF0D64&lt;/guid&gt;

</span></span></pre></div>

<a id="CalendarServertrunktwistedcaldavdirectoryxmlfilepy"></a>

<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/xmlfile.py (12879 => 12880)</h4>

<pre class="diff"><span>

<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/xmlfile.py        2014-03-12 18:24:06 UTC (rev 12879)

+++ CalendarServer/trunk/twistedcaldav/directory/xmlfile.py        2014-03-12 18:28:29 UTC (rev 12880)

</span><span class="lines">@@ -248,15 +248,6 @@

</span><span class="cx">         return self._accounts()

</span><span class="cx"> 

</span><span class="cx"> 

</span><del>-    def recordWithCalendarUserAddress(self, cua):

-        cua = normalizeCUAddr(cua)

-        for recordType in self.recordTypes():

-            record = self._lookupInIndex(recordType, self.INDEX_TYPE_CUA, cua)

-            if record and record.enabledForCalendaring:

-                return record

-        return None

-

-

</del><span class="cx">     def recordWithShortName(self, recordType, shortName):

</span><span class="cx">         return self._lookupInIndex(recordType, self.INDEX_TYPE_SHORTNAME, shortName)

</span><span class="cx"> 

</span></span></pre>

</div>

</div>


</body>

</html>