<!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>[13057] CalendarServer/branches/users/sagen/move2who-4</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/13057">13057</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 11:22:48 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix more tests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarservertoolstesttest_calverifypy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4confauthaccountstestxml">CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4confauthaugmentstestxml">CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaccountsxml">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaugmentsxml">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestresourcesxml">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsserverpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarservertoolstesttest_calverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -931,25 +931,7 @@
</span><span class="cx"> uuid3 = "AC478592-7783-44D1-B2AE-52359B4E8415"
</span><span class="cx"> uuidl1 = "75EA36BE-F71B-40F9-81F9-CF59BF40CA8F"
</span><span class="cx">
</span><del>- def configure(self):
- super(CalVerifyMismatchTestsBase, self).configure()
- self.patch(config.DirectoryService.params, "xmlFile",
- os.path.join(
- os.path.dirname(__file__), "calverify", "accounts.xml"
- )
- )
- self.patch(config.ResourceService.params, "xmlFile",
- os.path.join(
- os.path.dirname(__file__), "calverify", "resources.xml"
- )
- )
- self.patch(config.AugmentService.params, "xmlFiles",
- [os.path.join(
- os.path.dirname(__file__), "calverify", "augments.xml"
- ), ]
- )
</del><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def populate(self):
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4confauthaccountstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> <!DOCTYPE accounts SYSTEM "accounts.dtd">
</span><span class="cx">
</span><span class="cx"> <directory realm="Test Realm">
</span><ins>+
</ins><span class="cx"> <record type="user">
</span><span class="cx"> <uid>admin</uid>
</span><span class="cx"> <short-name>admin</short-name>
</span><span class="lines">@@ -74,363 +75,951 @@
</span><span class="cx"> <full-name>まだ</full-name>
</span><span class="cx"> </record>
</span><span class="cx">
</span><del>- <!-- twext.who xml doesn't (yet) support repeat
- <user repeat="101">
- <uid>user%02d</uid>
- <uid>User %02d</uid>
- <short-name>user%02d</short-name>
- <password>user%02d</password>
- <full-name>User %02d</full-name>
- <email>user%02d@example.com</email>
</del><ins>+ <record type="group">
+ <uid>group01</uid>
+ <short-name>group01</short-name>
+ <password>group01</password>
+ <full-name>Group 01</full-name>
+ <member-uid>user01</member-uid>
</ins><span class="cx"> </record>
</span><del>- <user repeat="10">
- <uid>public%02d</uid>
- <short-name>public%02d</short-name>
- <password>public%02d</password>
- <full-name>Public %02d</full-name>
</del><ins>+ <record type="group">
+ <uid>group02</uid>
+ <short-name>group02</short-name>
+ <password>group02</password>
+ <full-name>Group 02</full-name>
+ <member-uid >user06</member-uid>
+ <member-uid >user07</member-uid>
</ins><span class="cx"> </record>
</span><del>- -->
- <record type="user">
</del><ins>+ <record type="group">
+ <uid>group03</uid>
+ <short-name>group03</short-name>
+ <password>group03</password>
+ <full-name>Group 03</full-name>
+ <member-uid>user08</member-uid>
+ <member-uid>user09</member-uid>
+ </record>
+ <record type="group">
+ <uid>group04</uid>
+ <short-name>group04</short-name>
+ <password>group04</password>
+ <full-name>Group 04</full-name>
+ <member-uid>group02</member-uid>
+ <member-uid>group03</member-uid>
+ <member-uid>user10</member-uid>
+ </record>
+ <record type="group"> <!-- delegategroup -->
+ <uid>group05</uid>
+ <short-name>group05</short-name>
+ <password>group05</password>
+ <full-name>Group 05</full-name>
+ <member-uid>group06</member-uid>
+ <member-uid>user20</member-uid>
+ </record>
+ <record type="group"> <!-- delegatesubgroup -->
+ <uid>group06</uid>
+ <short-name>group06</short-name>
+ <password>group06</password>
+ <full-name>Group 06</full-name>
+ <member-uid>user21</member-uid>
+ </record>
+ <record type="group"> <!-- readonlydelegategroup -->
+ <uid>group07</uid>
+ <short-name>group07</short-name>
+ <password>group07</password>
+ <full-name>Group 07</full-name>
+ <member-uid>user22</member-uid>
+ <member-uid>user23</member-uid>
+ <member-uid>user24</member-uid>
+ </record>
+ <record type="group">
+ <uid>disabledgroup</uid>
+ <short-name>disabledgroup</short-name>
+ <password>disabledgroup</password>
+ <full-name>Disabled Group</full-name>
+ <member-uid>user01</member-uid>
+ </record>
+
+
+<!-- Generated records -->
+
+<record type="user">
</ins><span class="cx"> <short-name>user01</short-name>
</span><span class="cx"> <uid>user01</uid>
</span><span class="cx"> <password>user01</password>
</span><span class="cx"> <full-name>User 01</full-name>
</span><span class="cx"> <email>user01@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user02</short-name>
</span><span class="cx"> <uid>user02</uid>
</span><span class="cx"> <password>user02</password>
</span><span class="cx"> <full-name>User 02</full-name>
</span><span class="cx"> <email>user02@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user03</short-name>
</span><span class="cx"> <uid>user03</uid>
</span><span class="cx"> <password>user03</password>
</span><span class="cx"> <full-name>User 03</full-name>
</span><span class="cx"> <email>user03@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user04</short-name>
</span><span class="cx"> <uid>user04</uid>
</span><span class="cx"> <password>user04</password>
</span><span class="cx"> <full-name>User 04</full-name>
</span><span class="cx"> <email>user04@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user05</short-name>
</span><span class="cx"> <uid>user05</uid>
</span><span class="cx"> <password>user05</password>
</span><span class="cx"> <full-name>User 05</full-name>
</span><span class="cx"> <email>user05@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user06</short-name>
</span><span class="cx"> <uid>user06</uid>
</span><span class="cx"> <password>user06</password>
</span><span class="cx"> <full-name>User 06</full-name>
</span><span class="cx"> <email>user06@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user07</short-name>
</span><span class="cx"> <uid>user07</uid>
</span><span class="cx"> <password>user07</password>
</span><span class="cx"> <full-name>User 07</full-name>
</span><span class="cx"> <email>user07@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user08</short-name>
</span><span class="cx"> <uid>user08</uid>
</span><span class="cx"> <password>user08</password>
</span><span class="cx"> <full-name>User 08</full-name>
</span><span class="cx"> <email>user08@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user09</short-name>
</span><span class="cx"> <uid>user09</uid>
</span><span class="cx"> <password>user09</password>
</span><span class="cx"> <full-name>User 09</full-name>
</span><span class="cx"> <email>user09@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user10</short-name>
</span><span class="cx"> <uid>user10</uid>
</span><span class="cx"> <password>user10</password>
</span><span class="cx"> <full-name>User 10</full-name>
</span><span class="cx"> <email>user10@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user11</short-name>
</span><span class="cx"> <uid>user11</uid>
</span><span class="cx"> <password>user11</password>
</span><span class="cx"> <full-name>User 11</full-name>
</span><span class="cx"> <email>user11@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user12</short-name>
</span><span class="cx"> <uid>user12</uid>
</span><span class="cx"> <password>user12</password>
</span><span class="cx"> <full-name>User 12</full-name>
</span><span class="cx"> <email>user12@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user13</short-name>
</span><span class="cx"> <uid>user13</uid>
</span><span class="cx"> <password>user13</password>
</span><span class="cx"> <full-name>User 13</full-name>
</span><span class="cx"> <email>user13@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user14</short-name>
</span><span class="cx"> <uid>user14</uid>
</span><span class="cx"> <password>user14</password>
</span><span class="cx"> <full-name>User 14</full-name>
</span><span class="cx"> <email>user14@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user15</short-name>
</span><span class="cx"> <uid>user15</uid>
</span><span class="cx"> <password>user15</password>
</span><span class="cx"> <full-name>User 15</full-name>
</span><span class="cx"> <email>user15@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user16</short-name>
</span><span class="cx"> <uid>user16</uid>
</span><span class="cx"> <password>user16</password>
</span><span class="cx"> <full-name>User 16</full-name>
</span><span class="cx"> <email>user16@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user17</short-name>
</span><span class="cx"> <uid>user17</uid>
</span><span class="cx"> <password>user17</password>
</span><span class="cx"> <full-name>User 17</full-name>
</span><span class="cx"> <email>user17@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user18</short-name>
</span><span class="cx"> <uid>user18</uid>
</span><span class="cx"> <password>user18</password>
</span><span class="cx"> <full-name>User 18</full-name>
</span><span class="cx"> <email>user18@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user19</short-name>
</span><span class="cx"> <uid>user19</uid>
</span><span class="cx"> <password>user19</password>
</span><span class="cx"> <full-name>User 19</full-name>
</span><span class="cx"> <email>user19@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user20</short-name>
</span><span class="cx"> <uid>user20</uid>
</span><span class="cx"> <password>user20</password>
</span><span class="cx"> <full-name>User 20</full-name>
</span><span class="cx"> <email>user20@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user21</short-name>
</span><span class="cx"> <uid>user21</uid>
</span><span class="cx"> <password>user21</password>
</span><span class="cx"> <full-name>User 21</full-name>
</span><span class="cx"> <email>user21@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user22</short-name>
</span><span class="cx"> <uid>user22</uid>
</span><span class="cx"> <password>user22</password>
</span><span class="cx"> <full-name>User 22</full-name>
</span><span class="cx"> <email>user22@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user23</short-name>
</span><span class="cx"> <uid>user23</uid>
</span><span class="cx"> <password>user23</password>
</span><span class="cx"> <full-name>User 23</full-name>
</span><span class="cx"> <email>user23@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user24</short-name>
</span><span class="cx"> <uid>user24</uid>
</span><span class="cx"> <password>user24</password>
</span><span class="cx"> <full-name>User 24</full-name>
</span><span class="cx"> <email>user24@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>user25</short-name>
</span><span class="cx"> <uid>user25</uid>
</span><span class="cx"> <password>user25</password>
</span><span class="cx"> <full-name>User 25</full-name>
</span><span class="cx"> <email>user25@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
+ <short-name>user26</short-name>
+ <uid>user26</uid>
+ <password>user26</password>
+ <full-name>User 26</full-name>
+ <email>user26@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user27</short-name>
+ <uid>user27</uid>
+ <password>user27</password>
+ <full-name>User 27</full-name>
+ <email>user27@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user28</short-name>
+ <uid>user28</uid>
+ <password>user28</password>
+ <full-name>User 28</full-name>
+ <email>user28@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user29</short-name>
+ <uid>user29</uid>
+ <password>user29</password>
+ <full-name>User 29</full-name>
+ <email>user29@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user30</short-name>
+ <uid>user30</uid>
+ <password>user30</password>
+ <full-name>User 30</full-name>
+ <email>user30@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user31</short-name>
+ <uid>user31</uid>
+ <password>user31</password>
+ <full-name>User 31</full-name>
+ <email>user31@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user32</short-name>
+ <uid>user32</uid>
+ <password>user32</password>
+ <full-name>User 32</full-name>
+ <email>user32@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user33</short-name>
+ <uid>user33</uid>
+ <password>user33</password>
+ <full-name>User 33</full-name>
+ <email>user33@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user34</short-name>
+ <uid>user34</uid>
+ <password>user34</password>
+ <full-name>User 34</full-name>
+ <email>user34@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user35</short-name>
+ <uid>user35</uid>
+ <password>user35</password>
+ <full-name>User 35</full-name>
+ <email>user35@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user36</short-name>
+ <uid>user36</uid>
+ <password>user36</password>
+ <full-name>User 36</full-name>
+ <email>user36@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user37</short-name>
+ <uid>user37</uid>
+ <password>user37</password>
+ <full-name>User 37</full-name>
+ <email>user37@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user38</short-name>
+ <uid>user38</uid>
+ <password>user38</password>
+ <full-name>User 38</full-name>
+ <email>user38@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user39</short-name>
+ <uid>user39</uid>
+ <password>user39</password>
+ <full-name>User 39</full-name>
+ <email>user39@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user40</short-name>
+ <uid>user40</uid>
+ <password>user40</password>
+ <full-name>User 40</full-name>
+ <email>user40@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user41</short-name>
+ <uid>user41</uid>
+ <password>user41</password>
+ <full-name>User 41</full-name>
+ <email>user41@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user42</short-name>
+ <uid>user42</uid>
+ <password>user42</password>
+ <full-name>User 42</full-name>
+ <email>user42@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user43</short-name>
+ <uid>user43</uid>
+ <password>user43</password>
+ <full-name>User 43</full-name>
+ <email>user43@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user44</short-name>
+ <uid>user44</uid>
+ <password>user44</password>
+ <full-name>User 44</full-name>
+ <email>user44@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user45</short-name>
+ <uid>user45</uid>
+ <password>user45</password>
+ <full-name>User 45</full-name>
+ <email>user45@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user46</short-name>
+ <uid>user46</uid>
+ <password>user46</password>
+ <full-name>User 46</full-name>
+ <email>user46@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user47</short-name>
+ <uid>user47</uid>
+ <password>user47</password>
+ <full-name>User 47</full-name>
+ <email>user47@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user48</short-name>
+ <uid>user48</uid>
+ <password>user48</password>
+ <full-name>User 48</full-name>
+ <email>user48@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user49</short-name>
+ <uid>user49</uid>
+ <password>user49</password>
+ <full-name>User 49</full-name>
+ <email>user49@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user50</short-name>
+ <uid>user50</uid>
+ <password>user50</password>
+ <full-name>User 50</full-name>
+ <email>user50@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user51</short-name>
+ <uid>user51</uid>
+ <password>user51</password>
+ <full-name>User 51</full-name>
+ <email>user51@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user52</short-name>
+ <uid>user52</uid>
+ <password>user52</password>
+ <full-name>User 52</full-name>
+ <email>user52@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user53</short-name>
+ <uid>user53</uid>
+ <password>user53</password>
+ <full-name>User 53</full-name>
+ <email>user53@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user54</short-name>
+ <uid>user54</uid>
+ <password>user54</password>
+ <full-name>User 54</full-name>
+ <email>user54@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user55</short-name>
+ <uid>user55</uid>
+ <password>user55</password>
+ <full-name>User 55</full-name>
+ <email>user55@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user56</short-name>
+ <uid>user56</uid>
+ <password>user56</password>
+ <full-name>User 56</full-name>
+ <email>user56@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user57</short-name>
+ <uid>user57</uid>
+ <password>user57</password>
+ <full-name>User 57</full-name>
+ <email>user57@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user58</short-name>
+ <uid>user58</uid>
+ <password>user58</password>
+ <full-name>User 58</full-name>
+ <email>user58@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user59</short-name>
+ <uid>user59</uid>
+ <password>user59</password>
+ <full-name>User 59</full-name>
+ <email>user59@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user60</short-name>
+ <uid>user60</uid>
+ <password>user60</password>
+ <full-name>User 60</full-name>
+ <email>user60@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user61</short-name>
+ <uid>user61</uid>
+ <password>user61</password>
+ <full-name>User 61</full-name>
+ <email>user61@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user62</short-name>
+ <uid>user62</uid>
+ <password>user62</password>
+ <full-name>User 62</full-name>
+ <email>user62@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user63</short-name>
+ <uid>user63</uid>
+ <password>user63</password>
+ <full-name>User 63</full-name>
+ <email>user63@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user64</short-name>
+ <uid>user64</uid>
+ <password>user64</password>
+ <full-name>User 64</full-name>
+ <email>user64@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user65</short-name>
+ <uid>user65</uid>
+ <password>user65</password>
+ <full-name>User 65</full-name>
+ <email>user65@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user66</short-name>
+ <uid>user66</uid>
+ <password>user66</password>
+ <full-name>User 66</full-name>
+ <email>user66@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user67</short-name>
+ <uid>user67</uid>
+ <password>user67</password>
+ <full-name>User 67</full-name>
+ <email>user67@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user68</short-name>
+ <uid>user68</uid>
+ <password>user68</password>
+ <full-name>User 68</full-name>
+ <email>user68@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user69</short-name>
+ <uid>user69</uid>
+ <password>user69</password>
+ <full-name>User 69</full-name>
+ <email>user69@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user70</short-name>
+ <uid>user70</uid>
+ <password>user70</password>
+ <full-name>User 70</full-name>
+ <email>user70@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user71</short-name>
+ <uid>user71</uid>
+ <password>user71</password>
+ <full-name>User 71</full-name>
+ <email>user71@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user72</short-name>
+ <uid>user72</uid>
+ <password>user72</password>
+ <full-name>User 72</full-name>
+ <email>user72@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user73</short-name>
+ <uid>user73</uid>
+ <password>user73</password>
+ <full-name>User 73</full-name>
+ <email>user73@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user74</short-name>
+ <uid>user74</uid>
+ <password>user74</password>
+ <full-name>User 74</full-name>
+ <email>user74@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user75</short-name>
+ <uid>user75</uid>
+ <password>user75</password>
+ <full-name>User 75</full-name>
+ <email>user75@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user76</short-name>
+ <uid>user76</uid>
+ <password>user76</password>
+ <full-name>User 76</full-name>
+ <email>user76@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user77</short-name>
+ <uid>user77</uid>
+ <password>user77</password>
+ <full-name>User 77</full-name>
+ <email>user77@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user78</short-name>
+ <uid>user78</uid>
+ <password>user78</password>
+ <full-name>User 78</full-name>
+ <email>user78@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user79</short-name>
+ <uid>user79</uid>
+ <password>user79</password>
+ <full-name>User 79</full-name>
+ <email>user79@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user80</short-name>
+ <uid>user80</uid>
+ <password>user80</password>
+ <full-name>User 80</full-name>
+ <email>user80@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user81</short-name>
+ <uid>user81</uid>
+ <password>user81</password>
+ <full-name>User 81</full-name>
+ <email>user81@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user82</short-name>
+ <uid>user82</uid>
+ <password>user82</password>
+ <full-name>User 82</full-name>
+ <email>user82@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user83</short-name>
+ <uid>user83</uid>
+ <password>user83</password>
+ <full-name>User 83</full-name>
+ <email>user83@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user84</short-name>
+ <uid>user84</uid>
+ <password>user84</password>
+ <full-name>User 84</full-name>
+ <email>user84@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user85</short-name>
+ <uid>user85</uid>
+ <password>user85</password>
+ <full-name>User 85</full-name>
+ <email>user85@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user86</short-name>
+ <uid>user86</uid>
+ <password>user86</password>
+ <full-name>User 86</full-name>
+ <email>user86@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user87</short-name>
+ <uid>user87</uid>
+ <password>user87</password>
+ <full-name>User 87</full-name>
+ <email>user87@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user88</short-name>
+ <uid>user88</uid>
+ <password>user88</password>
+ <full-name>User 88</full-name>
+ <email>user88@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user89</short-name>
+ <uid>user89</uid>
+ <password>user89</password>
+ <full-name>User 89</full-name>
+ <email>user89@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user90</short-name>
+ <uid>user90</uid>
+ <password>user90</password>
+ <full-name>User 90</full-name>
+ <email>user90@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user91</short-name>
+ <uid>user91</uid>
+ <password>user91</password>
+ <full-name>User 91</full-name>
+ <email>user91@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user92</short-name>
+ <uid>user92</uid>
+ <password>user92</password>
+ <full-name>User 92</full-name>
+ <email>user92@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user93</short-name>
+ <uid>user93</uid>
+ <password>user93</password>
+ <full-name>User 93</full-name>
+ <email>user93@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user94</short-name>
+ <uid>user94</uid>
+ <password>user94</password>
+ <full-name>User 94</full-name>
+ <email>user94@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user95</short-name>
+ <uid>user95</uid>
+ <password>user95</password>
+ <full-name>User 95</full-name>
+ <email>user95@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user96</short-name>
+ <uid>user96</uid>
+ <password>user96</password>
+ <full-name>User 96</full-name>
+ <email>user96@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user97</short-name>
+ <uid>user97</uid>
+ <password>user97</password>
+ <full-name>User 97</full-name>
+ <email>user97@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user98</short-name>
+ <uid>user98</uid>
+ <password>user98</password>
+ <full-name>User 98</full-name>
+ <email>user98@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user99</short-name>
+ <uid>user99</uid>
+ <password>user99</password>
+ <full-name>User 99</full-name>
+ <email>user99@example.com</email>
+</record>
+
+<record type="user">
+ <short-name>user100</short-name>
+ <uid>user100</uid>
+ <password>user100</password>
+ <full-name>User 100</full-name>
+ <email>user100@example.com</email>
+</record>
+
+<record type="user">
</ins><span class="cx"> <short-name>public01</short-name>
</span><span class="cx"> <uid>public01</uid>
</span><span class="cx"> <password>public01</password>
</span><span class="cx"> <full-name>Public 01</full-name>
</span><span class="cx"> <email>public01@example.com</email>
</span><del>- </record>
</del><ins>+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>public02</short-name>
</span><span class="cx"> <uid>public02</uid>
</span><span class="cx"> <password>public02</password>
</span><span class="cx"> <full-name>Public 02</full-name>
</span><del>- <email>public02@example.com</email>
- </record>
</del><ins>+ <email>public02@example.com</email>
+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>public03</short-name>
</span><span class="cx"> <uid>public03</uid>
</span><span class="cx"> <password>public03</password>
</span><span class="cx"> <full-name>Public 03</full-name>
</span><del>- <email>public03@example.com</email>
- </record>
</del><ins>+ <email>public03@example.com</email>
+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>public04</short-name>
</span><span class="cx"> <uid>public04</uid>
</span><span class="cx"> <password>public04</password>
</span><span class="cx"> <full-name>Public 04</full-name>
</span><del>- <email>public04@example.com</email>
- </record>
</del><ins>+ <email>public04@example.com</email>
+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>public05</short-name>
</span><span class="cx"> <uid>public05</uid>
</span><span class="cx"> <password>public05</password>
</span><span class="cx"> <full-name>Public 05</full-name>
</span><del>- <email>public05@example.com</email>
- </record>
</del><ins>+ <email>public05@example.com</email>
+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>public06</short-name>
</span><span class="cx"> <uid>public06</uid>
</span><span class="cx"> <password>public06</password>
</span><span class="cx"> <full-name>Public 06</full-name>
</span><del>- <email>public06@example.com</email>
- </record>
</del><ins>+ <email>public06@example.com</email>
+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>public07</short-name>
</span><span class="cx"> <uid>public07</uid>
</span><span class="cx"> <password>public07</password>
</span><span class="cx"> <full-name>Public 07</full-name>
</span><del>- <email>public07@example.com</email>
- </record>
</del><ins>+ <email>public07@example.com</email>
+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>public08</short-name>
</span><span class="cx"> <uid>public08</uid>
</span><span class="cx"> <password>public08</password>
</span><span class="cx"> <full-name>Public 08</full-name>
</span><del>- <email>public08@example.com</email>
- </record>
</del><ins>+ <email>public08@example.com</email>
+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>public09</short-name>
</span><span class="cx"> <uid>public09</uid>
</span><span class="cx"> <password>public09</password>
</span><span class="cx"> <full-name>Public 09</full-name>
</span><del>- <email>public09@example.com</email>
- </record>
</del><ins>+ <email>public09@example.com</email>
+</record>
</ins><span class="cx">
</span><del>- <record type="user">
</del><ins>+<record type="user">
</ins><span class="cx"> <short-name>public10</short-name>
</span><span class="cx"> <uid>public10</uid>
</span><span class="cx"> <password>public10</password>
</span><span class="cx"> <full-name>Public 10</full-name>
</span><del>- <email>public10@example.com</email>
- </record>
</del><ins>+ <email>public10@example.com</email>
+</record>
</ins><span class="cx">
</span><del>- <record type="group">
- <uid>group01</uid>
- <short-name>group01</short-name>
- <password>group01</password>
- <full-name>Group 01</full-name>
- <member-uid type="users">user01</member-uid>
- </record>
- <record type="group">
- <uid>group02</uid>
- <short-name>group02</short-name>
- <password>group02</password>
- <full-name>Group 02</full-name>
- <member-uid >user06</member-uid>
- <member-uid >user07</member-uid>
- </record>
- <record type="group">
- <uid>group03</uid>
- <short-name>group03</short-name>
- <password>group03</password>
- <full-name>Group 03</full-name>
- <member-uid type="users">user08</member-uid>
- <member-uid type="users">user09</member-uid>
- </record>
- <record type="group">
- <uid>group04</uid>
- <short-name>group04</short-name>
- <password>group04</password>
- <full-name>Group 04</full-name>
- <member-uid type="groups">group02</member-uid>
- <member-uid type="groups">group03</member-uid>
- <member-uid type="users">user10</member-uid>
- </record>
- <record type="group"> <!-- delegategroup -->
- <uid>group05</uid>
- <short-name>group05</short-name>
- <password>group05</password>
- <full-name>Group 05</full-name>
- <member-uid type="groups">group06</member-uid>
- <member-uid type="users">user20</member-uid>
- </record>
- <record type="group"> <!-- delegatesubgroup -->
- <uid>group06</uid>
- <short-name>group06</short-name>
- <password>group06</password>
- <full-name>Group 06</full-name>
- <member-uid type="users">user21</member-uid>
- </record>
- <record type="group"> <!-- readonlydelegategroup -->
- <uid>group07</uid>
- <short-name>group07</short-name>
- <password>group07</password>
- <full-name>Group 07</full-name>
- <member-uid type="users">user22</member-uid>
- <member-uid type="users">user23</member-uid>
- <member-uid type="users">user24</member-uid>
- </record>
- <record type="group">
- <uid>disabledgroup</uid>
- <short-name>disabledgroup</short-name>
- <password>disabledgroup</password>
- <full-name>Disabled Group</full-name>
- <member-uid type="users">user01</member-uid>
- </record>
</del><span class="cx"> </directory>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4confauthaugmentstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -4,27 +4,23 @@
</span><span class="cx"> <augments>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>Default</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record repeat="10">
</span><span class="cx"> <uid>location%02d</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="cx"> </record>
</span><span class="cx"> <record repeat="3">
</span><span class="cx"> <uid>resource%02d</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>resource04</uid>
</span><del>- <enable>false</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -33,7 +29,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>resource05</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="lines">@@ -41,7 +36,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>resource06</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="lines">@@ -49,7 +43,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>resource07</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="lines">@@ -57,7 +50,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>resource08</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="lines">@@ -65,7 +57,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>resource09</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="lines">@@ -73,7 +64,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>resource10</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="lines">@@ -81,31 +71,20 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>resource11</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="cx"> <auto-schedule-mode>decline-always</auto-schedule-mode>
</span><span class="cx"> <auto-accept-group>group01</auto-accept-group>
</span><span class="cx"> </record>
</span><del>- <record repeat="10">
- <uid>group%02d</uid>
- <enable>true</enable>
- </record>
</del><span class="cx"> <record>
</span><del>- <uid>disabledgroup</uid>
- <enable>false</enable>
- </record>
- <record>
</del><span class="cx"> <uid>delegatedroom</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>false</enable-addressbook>
</span><span class="cx"> <auto-schedule>false</auto-schedule>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>03DFF660-8BCC-4198-8588-DD77F776F518</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -113,7 +92,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>80689D41-DAF8-4189-909C-DB017B271892</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -122,7 +100,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>C38BEE7A-36EE-478C-9DCB-CBF4612AFE65</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -132,7 +109,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>CCE95217-A57B-481A-AC3D-FEC9AB6CE3A9</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -140,7 +116,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>0CE0BF31-5F9E-4801-A489-8C70CF287F5F</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -148,7 +123,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>6F9EE33B-78F6-481B-9289-3D0812FF0D64</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -157,7 +131,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>76E7ECA6-08BC-4AE7-930D-F2E7453993A5</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -166,7 +139,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>63A2F949-2D8D-4C8D-B8A5-DCF2A94610F3</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -175,7 +147,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>06E3BDCB-9C19-485A-B14E-F146A80ADDC6</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="lines">@@ -184,7 +155,6 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>4D66A20A-1437-437D-8069-2F14E8322234</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaccountsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -65,20 +65,20 @@
</span><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>example</short-name>
</del><ins>+ <short-name>purge1</short-name>
</ins><span class="cx"> <uid>C76DB741-5A2A-4239-8112-10CF152AFCA4</uid>
</span><span class="cx"> <guid>C76DB741-5A2A-4239-8112-10CF152AFCA4</guid>
</span><del>- <password>example</password>
- <full-name>Example</full-name>
- <email>example@example.com</email>
</del><ins>+ <password>purge1</password>
+ <full-name>purge1</full-name>
+ <email>purge1@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>example2</short-name>
</del><ins>+ <short-name>purge2</short-name>
</ins><span class="cx"> <uid>FFED7B62-2E08-496E-BD32-B2F95FFDDB6B</uid>
</span><span class="cx"> <guid>FFED7B62-2E08-496E-BD32-B2F95FFDDB6B</guid>
</span><del>- <password>example2</password>
- <full-name>Example Two</full-name>
- <email>example2@example.com</email>
</del><ins>+ <password>purge2</password>
+ <full-name>purge2</full-name>
+ <email>purge2@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><span class="cx"> <short-name>home1</short-name>
</span><span class="lines">@@ -368,62 +368,43 @@
</span><span class="cx"> <member-uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</member-uid>
</span><span class="cx"> <member-uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</member-uid>
</span><span class="cx"> </record>
</span><del>- <!--
- <location>
- <uid>mercury</uid>
- <uid>mercury</uid>
- <password>mercury</password>
- <name>Mercury Seven</name>
- <email-address>mercury@example.com</email-address>
- </location>
- <location>
- <uid>gemini</uid>
- <uid>gemini</uid>
- <password>gemini</password>
- <name>Gemini Twelve</name>
- <email-address>gemini@example.com</email-address>
- </location>
- <location>
- <uid>apollo</uid>
- <uid>apollo</uid>
- <password>apollo</password>
- <name>Apollo Eleven</name>
- <email-address>apollo@example.com</email-address>
- </location>
- <location>
- <uid>orion</uid>
- <uid>orion</uid>
- <password>orion</password>
- <name>Orion</name>
- <email-address>orion@example.com</email-address>
- </location>
- <resource>
- <uid>transporter</uid>
- <uid>transporter</uid>
- <password>transporter</password>
- <name>Mass Transporter</name>
- <email-address>transporter@example.com</email-address>
- </resource>
- <resource>
- <uid>ftlcpu</uid>
- <uid>ftlcpu</uid>
- <password>ftlcpu</password>
- <name>Faster-Than-Light Microprocessor</name>
- <email-address>ftlcpu@example.com</email-address>
- </resource>
- <resource>
- <uid>non_calendar_proxy</uid>
- <uid>non_calendar_proxy</uid>
- <password>non_calendar_proxy</password>
- <name>Non-calendar proxy</name>
- <email-address>non_calendar_proxy@example.com</email-address>
- </resource>
- <resource>
- <uid>disabled</uid>
- <uid>disabled</uid>
- <password>disabled</password>
- <name>Disabled Record</name>
- <email-address>disabled@example.com</email-address>
- </resource>
--->
</del><ins>+
+ <!-- Calverify test records -->
+
+ <record type="user">
+ <short-name>example1</short-name>
+ <uid>D46F3D71-04B7-43C2-A7B6-6F92F92E61D0</uid>
+ <guid>D46F3D71-04B7-43C2-A7B6-6F92F92E61D0</guid>
+ <password>example</password>
+ <full-name>Example User1</full-name>
+ <email>example1@example.com</email>
+ </record>
+
+ <record type="user">
+ <short-name>example2</short-name>
+ <uid>47B16BB4-DB5F-4BF6-85FE-A7DA54230F92</uid>
+ <guid>47B16BB4-DB5F-4BF6-85FE-A7DA54230F92</guid>
+ <password>example</password>
+ <full-name>Example User2</full-name>
+ <email>example2@example.com</email>
+ </record>
+
+ <record type="user">
+ <short-name>example3</short-name>
+ <uid>AC478592-7783-44D1-B2AE-52359B4E8415</uid>
+ <guid>AC478592-7783-44D1-B2AE-52359B4E8415</guid>
+ <password>example</password>
+ <full-name>Example User3</full-name>
+ <email>example3@example.com</email>
+ </record>
+
+ <record type="user">
+ <short-name>example4</short-name>
+ <uid>A89E3A97-1658-4E45-A185-479F3E49D446</uid>
+ <guid>A89E3A97-1658-4E45-A185-479F3E49D446</guid>
+ <password>example</password>
+ <full-name>Example User4</full-name>
+ <email>example4@example.com</email>
+ </record>
+
</ins><span class="cx"> </directory>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaugmentsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -22,14 +22,12 @@
</span><span class="cx"> <!--
</span><span class="cx"> <record>
</span><span class="cx"> <uid>Location-Default</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule-mode>automatic</auto-schedule-mode>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>Resource-Default</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule-mode>automatic</auto-schedule-mode>
</span><span class="lines">@@ -38,177 +36,127 @@
</span><span class="cx">
</span><span class="cx"> <record>
</span><span class="cx"> <uid>D11F03A0-97EA-48AF-9A6C-FAC7F3975766</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <server-id>00001</server-id>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <server-id>00002</server-id>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>543D28BA-F74F-4D5F-9243-B3E3A61171E5</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>false</enable-calendar>
</span><span class="cx"> <enable-addressbook>false</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record repeat="100">
</span><span class="cx"> <uid>user%02d</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><del>- <uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>admin</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>grunts</uid>
- <enable>true</enable>
- </record>
- <record>
</del><span class="cx"> <uid>right_coast</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>left_coast</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><del>- <uid>both_coasts</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>recursive1_coasts</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>recursive2_coasts</uid>
- <enable>true</enable>
- </record>
- <record>
- <uid>non_calendar_group</uid>
- <enable>true</enable>
- </record>
- <record>
</del><span class="cx"> <uid>mercury</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>gemini</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>apollo</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-accept-group>both_coasts</auto-accept-group>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>orion</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>transporter</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>ftlcpu</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <!--
</span><span class="cx"> <record>
</span><span class="cx"> <uid>non_calendar_proxy</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> -->
</span><span class="cx"> <record>
</span><del>- <uid>disabled</uid>
- <enable>false</enable>
- </record>
- <record>
</del><span class="cx"> <uid>7423F94A-6B76-4A3A-815B-D52CFD77935D</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>8A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>9E1FFAC4-3CCD-45A1-8272-D161C92D2EEE</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>7678EC8A-A069-4E82-9066-7279C6718507</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>FC465590-E9E9-4746-ACE8-6C756A49FE4D</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>EC465590-E9E9-4746-ACE8-6C756A49FE4D</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>00599DAF-3E75-42DD-9DB7-52617E79943F</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>false</enable-calendar>
</span><span class="cx"> <enable-login>false</enable-login>
</span><span class="cx"> </record>
</span><ins>+ <record>
+ <uid>75EA36BE-F71B-40F9-81F9-CF59BF40CA8F</uid>
+ <enable-calendar>true</enable-calendar>
+ <auto-schedule>true</auto-schedule>
+ </record>
+
</ins><span class="cx"> </augments>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestresourcesxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -80,4 +80,12 @@
</span><span class="cx"> <short-name>sanchezoffice</short-name>
</span><span class="cx"> <full-name>Sanchez Office</full-name>
</span><span class="cx"> </record>
</span><ins>+ <record type="location">
+ <short-name>location01</short-name>
+ <uid>75EA36BE-F71B-40F9-81F9-CF59BF40CA8F</uid>
+ <guid>75EA36BE-F71B-40F9-81F9-CF59BF40CA8F</guid>
+ <password>location01</password>
+ <full-name>Room 01</full-name>
+ </record>
+
</ins><span class="cx"> </directory>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -352,23 +352,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- # For scheduling/freebusy
- # FIXME: doesn't this need to happen in the DPS?
- @inlineCallbacks
- def isProxyFor(self, other):
- for recordType in (
- txdav.who.delegates.RecordType.readDelegatorGroup,
- txdav.who.delegates.RecordType.writeDelegatorGroup,
- ):
- delegatorGroup = yield self.service.recordWithShortName(
- recordType, self.uid
- )
- if delegatorGroup:
- if other in (yield delegatorGroup.members()):
- returnValue(True)
</del><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> # Test client:
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.expression import MatchType, MatchFlags, Operand
</span><del>-from twext.who.idirectory import RecordType
</del><span class="cx"> from twisted.application import service
</span><span class="cx"> from twisted.application.strports import service as strPortsService
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> records = (yield self.client.recordsWithRecordType(
</span><span class="cx"> RecordType.user
</span><span class="cx"> ))
</span><del>- self.assertEquals(len(records), 31)
</del><ins>+ self.assertEquals(len(records), 35)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py (13056 => 13057)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-31 16:42:57 UTC (rev 13056)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-31 18:22:48 UTC (rev 13057)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> from txdav.who.idirectory import (
</span><span class="cx"> RecordType as DAVRecordType, AutoScheduleMode
</span><span class="cx"> )
</span><ins>+from txdav.who.delegates import RecordType as DelegateRecordType
</ins><span class="cx"> from txweb2.auth.digest import DigestedCredentials
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="lines">@@ -64,8 +65,12 @@
</span><span class="cx"> address = normalizeCUAddr(address)
</span><span class="cx"> record = None
</span><span class="cx"> if address.startswith("urn:uuid:"):
</span><del>- guid = address[9:]
- record = yield self.recordWithGUID(uuid.UUID(guid))
</del><ins>+ try:
+ guid = uuid.UUID(address[9:])
+ except ValueError:
+ log.info("Invalid GUID: {guid}", guid=address[9:])
+ returnValue(None)
+ record = yield self.recordWithGUID(guid)
</ins><span class="cx"> elif address.startswith("mailto:"):
</span><span class="cx"> records = yield self.recordsWithEmailAddress(address[7:])
</span><span class="cx"> if records:
</span><span class="lines">@@ -201,6 +206,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class CalendarDirectoryRecordMixin(object):
</span><ins>+ """
+ Calendar (and Contacts) specific logic for directory records lives in this
+ class
+ """
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -364,7 +373,7 @@
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>- #MOVE2WHO
</del><ins>+ # FIXME:
</ins><span class="cx"> def thisServer(self):
</span><span class="cx"> return True
</span><span class="cx">
</span><span class="lines">@@ -444,3 +453,18 @@
</span><span class="cx"> yield member.expandedMembers(members)
</span><span class="cx">
</span><span class="cx"> returnValue(members)
</span><ins>+
+
+ # For scheduling/freebusy
+ @inlineCallbacks
+ def isProxyFor(self, other):
+ for recordType in (
+ DelegateRecordType.readDelegatorGroup,
+ DelegateRecordType.writeDelegatorGroup,
+ ):
+ delegatorGroup = yield self.service.recordWithShortName(
+ recordType, self.uid
+ )
+ if delegatorGroup:
+ if other in (yield delegatorGroup.members()):
+ returnValue(True)
</ins></span></pre>
</div>
</div>
</body>
</html>