<!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>[13375] 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/13375">13375</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-26 08:10:28 -0700 (Sat, 26 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix iSchedule/podding resources to reject request of the other type. This also involved doing a lot
of clean up to the account XML files (fixing the DTDs), and also adds a new set of config files
to allow an iSchedule server to be run in conjunction with the two-pod podA, podB configs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkconfauthaccountstestpodxml">CalendarServer/trunk/conf/auth/accounts-test-pod.xml</a></li>
<li><a href="#CalendarServertrunkconfauthaccountstestxml">CalendarServer/trunk/conf/auth/accounts-test.xml</a></li>
<li><a href="#CalendarServertrunkconfauthaccountsdtd">CalendarServer/trunk/conf/auth/accounts.dtd</a></li>
<li><a href="#CalendarServertrunkconfauthaccountsxml">CalendarServer/trunk/conf/auth/accounts.xml</a></li>
<li><a href="#CalendarServertrunkconfauthaugmentsdefaultxml">CalendarServer/trunk/conf/auth/augments-default.xml</a></li>
<li><a href="#CalendarServertrunkconfauthaugmentstestpodxml">CalendarServer/trunk/conf/auth/augments-test-pod.xml</a></li>
<li><a href="#CalendarServertrunkconfauthaugmentstestxml">CalendarServer/trunk/conf/auth/augments-test.xml</a></li>
<li><a href="#CalendarServertrunkconfauthaugmentsdtd">CalendarServer/trunk/conf/auth/augments.dtd</a></li>
<li><a href="#CalendarServertrunkconfauthgenerate_test_accountspy">CalendarServer/trunk/conf/auth/generate_test_accounts.py</a></li>
<li><a href="#CalendarServertrunkconfauthproxiestestpodxml">CalendarServer/trunk/conf/auth/proxies-test-pod.xml</a></li>
<li><a href="#CalendarServertrunkconfauthproxiestestxml">CalendarServer/trunk/conf/auth/proxies-test.xml</a></li>
<li><a href="#CalendarServertrunkconfauthproxiesdtd">CalendarServer/trunk/conf/auth/proxies.dtd</a></li>
<li><a href="#CalendarServertrunkconfauthresourcestestpodxml">CalendarServer/trunk/conf/auth/resources-test-pod.xml</a></li>
<li><a href="#CalendarServertrunkconfauthresourcestestxml">CalendarServer/trunk/conf/auth/resources-test.xml</a></li>
<li><a href="#CalendarServertrunkconfcaldavdtestpodAplist">CalendarServer/trunk/conf/caldavd-test-podA.plist</a></li>
<li><a href="#CalendarServertrunkconfcaldavdtestpodBplist">CalendarServer/trunk/conf/caldavd-test-podB.plist</a></li>
<li><a href="#CalendarServertrunkconfremoteserverstestxml">CalendarServer/trunk/conf/remoteservers-test.xml</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorycalendaruserproxyloaderpy">CalendarServer/trunk/twistedcaldav/directory/calendaruserproxyloader.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytestaccountsxml">CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytestaugmentsnormalizationxml">CalendarServer/trunk/twistedcaldav/directory/test/augments-normalization.xml</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytestaugmentstestdefaultxml">CalendarServer/trunk/twistedcaldav/directory/test/augments-test-default.xml</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytestaugmentstestxml">CalendarServer/trunk/twistedcaldav/directory/test/augments-test.xml</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytestaugmentsxml">CalendarServer/trunk/twistedcaldav/directory/test/augments.xml</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytestproxiesxml">CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytestresourcesxml">CalendarServer/trunk/twistedcaldav/directory/test/resources.xml</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_augmentpy">CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduledeliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduleschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_resourcepy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretestutilpy">CalendarServer/trunk/txdav/common/datastore/test/util.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkconfauthaccountstests2sxml">CalendarServer/trunk/conf/auth/accounts-test-s2s.xml</a></li>
<li><a href="#CalendarServertrunkconfauthaugmentstests2sxml">CalendarServer/trunk/conf/auth/augments-test-s2s.xml</a></li>
<li><a href="#CalendarServertrunkconfauthproxiestests2sxml">CalendarServer/trunk/conf/auth/proxies-test-s2s.xml</a></li>
<li><a href="#CalendarServertrunkconfauthresourcestests2sxml">CalendarServer/trunk/conf/auth/resources-test-s2s.xml</a></li>
<li><a href="#CalendarServertrunkconfcaldavdtests2splist">CalendarServer/trunk/conf/caldavd-test-s2s.plist</a></li>
<li>CalendarServer/trunk/conf/dkim-test/</li>
<li>CalendarServer/trunk/conf/dkim-test/other_keys/</li>
<li><a href="#CalendarServertrunkconfdkimtestother_keysexampleorgischedule2">CalendarServer/trunk/conf/dkim-test/other_keys/example.org#ischedule2</a></li>
<li><a href="#CalendarServertrunkconfdkimtestprivpem">CalendarServer/trunk/conf/dkim-test/priv.pem</a></li>
<li><a href="#CalendarServertrunkconfdkimtestpubpem">CalendarServer/trunk/conf/dkim-test/pub.pem</a></li>
<li>CalendarServer/trunk/conf/dkim-test-s2s/</li>
<li>CalendarServer/trunk/conf/dkim-test-s2s/other_keys/</li>
<li><a href="#CalendarServertrunkconfdkimtests2sother_keysexamplecomischedule">CalendarServer/trunk/conf/dkim-test-s2s/other_keys/example.com#ischedule</a></li>
<li><a href="#CalendarServertrunkconfdkimtests2sprivpem">CalendarServer/trunk/conf/dkim-test-s2s/priv.pem</a></li>
<li><a href="#CalendarServertrunkconfdkimtests2spubpem">CalendarServer/trunk/conf/dkim-test-s2s/pub.pem</a></li>
<li><a href="#CalendarServertrunkconfremoteserverstests2sxml">CalendarServer/trunk/conf/remoteservers-test-s2s.xml</a></li>
<li><a href="#CalendarServertrunkconftestdbzones">CalendarServer/trunk/conf/test-db.zones</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytestaccountsmodifiedxml">CalendarServer/trunk/twistedcaldav/directory/test/accounts-modified.xml</a></li>
<li>CalendarServer/trunk/twistedcaldav/directory/test/modify/</li>
<li>CalendarServer/trunk/twistedcaldav/directory/test/resources/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkconfauthaccountstestpodxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/accounts-test-pod.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/accounts-test-pod.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/accounts-test-pod.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -1,32 +1,1630 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx">
</span><del>-<accounts realm="Test Realm">
- <user>
- <uid>admin</uid>
- <guid>admin</guid>
</del><ins>+<!--
+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
+<directory realm="Test Realm">
+<record>
+ <uid>0C8BDE62-E600-4696-83D3-8B5ECABDFD2E</uid>
+ <guid>0C8BDE62-E600-4696-83D3-8B5ECABDFD2E</guid>
+ <short-name>admin</short-name>
</ins><span class="cx"> <password>admin</password>
</span><del>- <name>Super User</name>
- <first-name>Super</first-name>
- <last-name>User</last-name>
- </user>
- <user repeat="101">
- <uid>user%02d</uid>
- <uid>User %02d</uid>
- <guid>user%02d</guid>
- <password>user%02d</password>
- <name>User %02d</name>
- <first-name>User</first-name>
- <last-name>%02d</last-name>
- <email-address>user%02d@example.com</email-address>
- </user>
- <user repeat="101">
- <uid>puser%02d</uid>
- <uid>Puser %02d</uid>
- <guid>puser%02d</guid>
- <password>puser%02d</password>
- <name>Puser %02d</name>
- <first-name>Puser</first-name>
- <last-name>%02d</last-name>
- <email-address>puser%02d@example.com</email-address>
- </user>
-</accounts>
</del><ins>+ <full-name>Super User</full-name>
+ <email>admin@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000001</uid>
+ <guid>10000000-0000-0000-0000-000000000001</guid>
+ <short-name>user01</short-name>
+ <password>user01</password>
+ <full-name>User 01</full-name>
+ <email>user01@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000002</uid>
+ <guid>10000000-0000-0000-0000-000000000002</guid>
+ <short-name>user02</short-name>
+ <password>user02</password>
+ <full-name>User 02</full-name>
+ <email>user02@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000003</uid>
+ <guid>10000000-0000-0000-0000-000000000003</guid>
+ <short-name>user03</short-name>
+ <password>user03</password>
+ <full-name>User 03</full-name>
+ <email>user03@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000004</uid>
+ <guid>10000000-0000-0000-0000-000000000004</guid>
+ <short-name>user04</short-name>
+ <password>user04</password>
+ <full-name>User 04</full-name>
+ <email>user04@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000005</uid>
+ <guid>10000000-0000-0000-0000-000000000005</guid>
+ <short-name>user05</short-name>
+ <password>user05</password>
+ <full-name>User 05</full-name>
+ <email>user05@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000006</uid>
+ <guid>10000000-0000-0000-0000-000000000006</guid>
+ <short-name>user06</short-name>
+ <password>user06</password>
+ <full-name>User 06</full-name>
+ <email>user06@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000007</uid>
+ <guid>10000000-0000-0000-0000-000000000007</guid>
+ <short-name>user07</short-name>
+ <password>user07</password>
+ <full-name>User 07</full-name>
+ <email>user07@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000008</uid>
+ <guid>10000000-0000-0000-0000-000000000008</guid>
+ <short-name>user08</short-name>
+ <password>user08</password>
+ <full-name>User 08</full-name>
+ <email>user08@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000009</uid>
+ <guid>10000000-0000-0000-0000-000000000009</guid>
+ <short-name>user09</short-name>
+ <password>user09</password>
+ <full-name>User 09</full-name>
+ <email>user09@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000010</uid>
+ <guid>10000000-0000-0000-0000-000000000010</guid>
+ <short-name>user10</short-name>
+ <password>user10</password>
+ <full-name>User 10</full-name>
+ <email>user10@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000011</uid>
+ <guid>10000000-0000-0000-0000-000000000011</guid>
+ <short-name>user11</short-name>
+ <password>user11</password>
+ <full-name>User 11</full-name>
+ <email>user11@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000012</uid>
+ <guid>10000000-0000-0000-0000-000000000012</guid>
+ <short-name>user12</short-name>
+ <password>user12</password>
+ <full-name>User 12</full-name>
+ <email>user12@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000013</uid>
+ <guid>10000000-0000-0000-0000-000000000013</guid>
+ <short-name>user13</short-name>
+ <password>user13</password>
+ <full-name>User 13</full-name>
+ <email>user13@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000014</uid>
+ <guid>10000000-0000-0000-0000-000000000014</guid>
+ <short-name>user14</short-name>
+ <password>user14</password>
+ <full-name>User 14</full-name>
+ <email>user14@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000015</uid>
+ <guid>10000000-0000-0000-0000-000000000015</guid>
+ <short-name>user15</short-name>
+ <password>user15</password>
+ <full-name>User 15</full-name>
+ <email>user15@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000016</uid>
+ <guid>10000000-0000-0000-0000-000000000016</guid>
+ <short-name>user16</short-name>
+ <password>user16</password>
+ <full-name>User 16</full-name>
+ <email>user16@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000017</uid>
+ <guid>10000000-0000-0000-0000-000000000017</guid>
+ <short-name>user17</short-name>
+ <password>user17</password>
+ <full-name>User 17</full-name>
+ <email>user17@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000018</uid>
+ <guid>10000000-0000-0000-0000-000000000018</guid>
+ <short-name>user18</short-name>
+ <password>user18</password>
+ <full-name>User 18</full-name>
+ <email>user18@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000019</uid>
+ <guid>10000000-0000-0000-0000-000000000019</guid>
+ <short-name>user19</short-name>
+ <password>user19</password>
+ <full-name>User 19</full-name>
+ <email>user19@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000020</uid>
+ <guid>10000000-0000-0000-0000-000000000020</guid>
+ <short-name>user20</short-name>
+ <password>user20</password>
+ <full-name>User 20</full-name>
+ <email>user20@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000021</uid>
+ <guid>10000000-0000-0000-0000-000000000021</guid>
+ <short-name>user21</short-name>
+ <password>user21</password>
+ <full-name>User 21</full-name>
+ <email>user21@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000022</uid>
+ <guid>10000000-0000-0000-0000-000000000022</guid>
+ <short-name>user22</short-name>
+ <password>user22</password>
+ <full-name>User 22</full-name>
+ <email>user22@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000023</uid>
+ <guid>10000000-0000-0000-0000-000000000023</guid>
+ <short-name>user23</short-name>
+ <password>user23</password>
+ <full-name>User 23</full-name>
+ <email>user23@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000024</uid>
+ <guid>10000000-0000-0000-0000-000000000024</guid>
+ <short-name>user24</short-name>
+ <password>user24</password>
+ <full-name>User 24</full-name>
+ <email>user24@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000025</uid>
+ <guid>10000000-0000-0000-0000-000000000025</guid>
+ <short-name>user25</short-name>
+ <password>user25</password>
+ <full-name>User 25</full-name>
+ <email>user25@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000026</uid>
+ <guid>10000000-0000-0000-0000-000000000026</guid>
+ <short-name>user26</short-name>
+ <password>user26</password>
+ <full-name>User 26</full-name>
+ <email>user26@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000027</uid>
+ <guid>10000000-0000-0000-0000-000000000027</guid>
+ <short-name>user27</short-name>
+ <password>user27</password>
+ <full-name>User 27</full-name>
+ <email>user27@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000028</uid>
+ <guid>10000000-0000-0000-0000-000000000028</guid>
+ <short-name>user28</short-name>
+ <password>user28</password>
+ <full-name>User 28</full-name>
+ <email>user28@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000029</uid>
+ <guid>10000000-0000-0000-0000-000000000029</guid>
+ <short-name>user29</short-name>
+ <password>user29</password>
+ <full-name>User 29</full-name>
+ <email>user29@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000030</uid>
+ <guid>10000000-0000-0000-0000-000000000030</guid>
+ <short-name>user30</short-name>
+ <password>user30</password>
+ <full-name>User 30</full-name>
+ <email>user30@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000031</uid>
+ <guid>10000000-0000-0000-0000-000000000031</guid>
+ <short-name>user31</short-name>
+ <password>user31</password>
+ <full-name>User 31</full-name>
+ <email>user31@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000032</uid>
+ <guid>10000000-0000-0000-0000-000000000032</guid>
+ <short-name>user32</short-name>
+ <password>user32</password>
+ <full-name>User 32</full-name>
+ <email>user32@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000033</uid>
+ <guid>10000000-0000-0000-0000-000000000033</guid>
+ <short-name>user33</short-name>
+ <password>user33</password>
+ <full-name>User 33</full-name>
+ <email>user33@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000034</uid>
+ <guid>10000000-0000-0000-0000-000000000034</guid>
+ <short-name>user34</short-name>
+ <password>user34</password>
+ <full-name>User 34</full-name>
+ <email>user34@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000035</uid>
+ <guid>10000000-0000-0000-0000-000000000035</guid>
+ <short-name>user35</short-name>
+ <password>user35</password>
+ <full-name>User 35</full-name>
+ <email>user35@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000036</uid>
+ <guid>10000000-0000-0000-0000-000000000036</guid>
+ <short-name>user36</short-name>
+ <password>user36</password>
+ <full-name>User 36</full-name>
+ <email>user36@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000037</uid>
+ <guid>10000000-0000-0000-0000-000000000037</guid>
+ <short-name>user37</short-name>
+ <password>user37</password>
+ <full-name>User 37</full-name>
+ <email>user37@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000038</uid>
+ <guid>10000000-0000-0000-0000-000000000038</guid>
+ <short-name>user38</short-name>
+ <password>user38</password>
+ <full-name>User 38</full-name>
+ <email>user38@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000039</uid>
+ <guid>10000000-0000-0000-0000-000000000039</guid>
+ <short-name>user39</short-name>
+ <password>user39</password>
+ <full-name>User 39</full-name>
+ <email>user39@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000040</uid>
+ <guid>10000000-0000-0000-0000-000000000040</guid>
+ <short-name>user40</short-name>
+ <password>user40</password>
+ <full-name>User 40</full-name>
+ <email>user40@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000041</uid>
+ <guid>10000000-0000-0000-0000-000000000041</guid>
+ <short-name>user41</short-name>
+ <password>user41</password>
+ <full-name>User 41</full-name>
+ <email>user41@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000042</uid>
+ <guid>10000000-0000-0000-0000-000000000042</guid>
+ <short-name>user42</short-name>
+ <password>user42</password>
+ <full-name>User 42</full-name>
+ <email>user42@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000043</uid>
+ <guid>10000000-0000-0000-0000-000000000043</guid>
+ <short-name>user43</short-name>
+ <password>user43</password>
+ <full-name>User 43</full-name>
+ <email>user43@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000044</uid>
+ <guid>10000000-0000-0000-0000-000000000044</guid>
+ <short-name>user44</short-name>
+ <password>user44</password>
+ <full-name>User 44</full-name>
+ <email>user44@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000045</uid>
+ <guid>10000000-0000-0000-0000-000000000045</guid>
+ <short-name>user45</short-name>
+ <password>user45</password>
+ <full-name>User 45</full-name>
+ <email>user45@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000046</uid>
+ <guid>10000000-0000-0000-0000-000000000046</guid>
+ <short-name>user46</short-name>
+ <password>user46</password>
+ <full-name>User 46</full-name>
+ <email>user46@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000047</uid>
+ <guid>10000000-0000-0000-0000-000000000047</guid>
+ <short-name>user47</short-name>
+ <password>user47</password>
+ <full-name>User 47</full-name>
+ <email>user47@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000048</uid>
+ <guid>10000000-0000-0000-0000-000000000048</guid>
+ <short-name>user48</short-name>
+ <password>user48</password>
+ <full-name>User 48</full-name>
+ <email>user48@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000049</uid>
+ <guid>10000000-0000-0000-0000-000000000049</guid>
+ <short-name>user49</short-name>
+ <password>user49</password>
+ <full-name>User 49</full-name>
+ <email>user49@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000050</uid>
+ <guid>10000000-0000-0000-0000-000000000050</guid>
+ <short-name>user50</short-name>
+ <password>user50</password>
+ <full-name>User 50</full-name>
+ <email>user50@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000051</uid>
+ <guid>10000000-0000-0000-0000-000000000051</guid>
+ <short-name>user51</short-name>
+ <password>user51</password>
+ <full-name>User 51</full-name>
+ <email>user51@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000052</uid>
+ <guid>10000000-0000-0000-0000-000000000052</guid>
+ <short-name>user52</short-name>
+ <password>user52</password>
+ <full-name>User 52</full-name>
+ <email>user52@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000053</uid>
+ <guid>10000000-0000-0000-0000-000000000053</guid>
+ <short-name>user53</short-name>
+ <password>user53</password>
+ <full-name>User 53</full-name>
+ <email>user53@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000054</uid>
+ <guid>10000000-0000-0000-0000-000000000054</guid>
+ <short-name>user54</short-name>
+ <password>user54</password>
+ <full-name>User 54</full-name>
+ <email>user54@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000055</uid>
+ <guid>10000000-0000-0000-0000-000000000055</guid>
+ <short-name>user55</short-name>
+ <password>user55</password>
+ <full-name>User 55</full-name>
+ <email>user55@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000056</uid>
+ <guid>10000000-0000-0000-0000-000000000056</guid>
+ <short-name>user56</short-name>
+ <password>user56</password>
+ <full-name>User 56</full-name>
+ <email>user56@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000057</uid>
+ <guid>10000000-0000-0000-0000-000000000057</guid>
+ <short-name>user57</short-name>
+ <password>user57</password>
+ <full-name>User 57</full-name>
+ <email>user57@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000058</uid>
+ <guid>10000000-0000-0000-0000-000000000058</guid>
+ <short-name>user58</short-name>
+ <password>user58</password>
+ <full-name>User 58</full-name>
+ <email>user58@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000059</uid>
+ <guid>10000000-0000-0000-0000-000000000059</guid>
+ <short-name>user59</short-name>
+ <password>user59</password>
+ <full-name>User 59</full-name>
+ <email>user59@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000060</uid>
+ <guid>10000000-0000-0000-0000-000000000060</guid>
+ <short-name>user60</short-name>
+ <password>user60</password>
+ <full-name>User 60</full-name>
+ <email>user60@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000061</uid>
+ <guid>10000000-0000-0000-0000-000000000061</guid>
+ <short-name>user61</short-name>
+ <password>user61</password>
+ <full-name>User 61</full-name>
+ <email>user61@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000062</uid>
+ <guid>10000000-0000-0000-0000-000000000062</guid>
+ <short-name>user62</short-name>
+ <password>user62</password>
+ <full-name>User 62</full-name>
+ <email>user62@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000063</uid>
+ <guid>10000000-0000-0000-0000-000000000063</guid>
+ <short-name>user63</short-name>
+ <password>user63</password>
+ <full-name>User 63</full-name>
+ <email>user63@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000064</uid>
+ <guid>10000000-0000-0000-0000-000000000064</guid>
+ <short-name>user64</short-name>
+ <password>user64</password>
+ <full-name>User 64</full-name>
+ <email>user64@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000065</uid>
+ <guid>10000000-0000-0000-0000-000000000065</guid>
+ <short-name>user65</short-name>
+ <password>user65</password>
+ <full-name>User 65</full-name>
+ <email>user65@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000066</uid>
+ <guid>10000000-0000-0000-0000-000000000066</guid>
+ <short-name>user66</short-name>
+ <password>user66</password>
+ <full-name>User 66</full-name>
+ <email>user66@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000067</uid>
+ <guid>10000000-0000-0000-0000-000000000067</guid>
+ <short-name>user67</short-name>
+ <password>user67</password>
+ <full-name>User 67</full-name>
+ <email>user67@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000068</uid>
+ <guid>10000000-0000-0000-0000-000000000068</guid>
+ <short-name>user68</short-name>
+ <password>user68</password>
+ <full-name>User 68</full-name>
+ <email>user68@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000069</uid>
+ <guid>10000000-0000-0000-0000-000000000069</guid>
+ <short-name>user69</short-name>
+ <password>user69</password>
+ <full-name>User 69</full-name>
+ <email>user69@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000070</uid>
+ <guid>10000000-0000-0000-0000-000000000070</guid>
+ <short-name>user70</short-name>
+ <password>user70</password>
+ <full-name>User 70</full-name>
+ <email>user70@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000071</uid>
+ <guid>10000000-0000-0000-0000-000000000071</guid>
+ <short-name>user71</short-name>
+ <password>user71</password>
+ <full-name>User 71</full-name>
+ <email>user71@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000072</uid>
+ <guid>10000000-0000-0000-0000-000000000072</guid>
+ <short-name>user72</short-name>
+ <password>user72</password>
+ <full-name>User 72</full-name>
+ <email>user72@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000073</uid>
+ <guid>10000000-0000-0000-0000-000000000073</guid>
+ <short-name>user73</short-name>
+ <password>user73</password>
+ <full-name>User 73</full-name>
+ <email>user73@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000074</uid>
+ <guid>10000000-0000-0000-0000-000000000074</guid>
+ <short-name>user74</short-name>
+ <password>user74</password>
+ <full-name>User 74</full-name>
+ <email>user74@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000075</uid>
+ <guid>10000000-0000-0000-0000-000000000075</guid>
+ <short-name>user75</short-name>
+ <password>user75</password>
+ <full-name>User 75</full-name>
+ <email>user75@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000076</uid>
+ <guid>10000000-0000-0000-0000-000000000076</guid>
+ <short-name>user76</short-name>
+ <password>user76</password>
+ <full-name>User 76</full-name>
+ <email>user76@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000077</uid>
+ <guid>10000000-0000-0000-0000-000000000077</guid>
+ <short-name>user77</short-name>
+ <password>user77</password>
+ <full-name>User 77</full-name>
+ <email>user77@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000078</uid>
+ <guid>10000000-0000-0000-0000-000000000078</guid>
+ <short-name>user78</short-name>
+ <password>user78</password>
+ <full-name>User 78</full-name>
+ <email>user78@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000079</uid>
+ <guid>10000000-0000-0000-0000-000000000079</guid>
+ <short-name>user79</short-name>
+ <password>user79</password>
+ <full-name>User 79</full-name>
+ <email>user79@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000080</uid>
+ <guid>10000000-0000-0000-0000-000000000080</guid>
+ <short-name>user80</short-name>
+ <password>user80</password>
+ <full-name>User 80</full-name>
+ <email>user80@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000081</uid>
+ <guid>10000000-0000-0000-0000-000000000081</guid>
+ <short-name>user81</short-name>
+ <password>user81</password>
+ <full-name>User 81</full-name>
+ <email>user81@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000082</uid>
+ <guid>10000000-0000-0000-0000-000000000082</guid>
+ <short-name>user82</short-name>
+ <password>user82</password>
+ <full-name>User 82</full-name>
+ <email>user82@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000083</uid>
+ <guid>10000000-0000-0000-0000-000000000083</guid>
+ <short-name>user83</short-name>
+ <password>user83</password>
+ <full-name>User 83</full-name>
+ <email>user83@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000084</uid>
+ <guid>10000000-0000-0000-0000-000000000084</guid>
+ <short-name>user84</short-name>
+ <password>user84</password>
+ <full-name>User 84</full-name>
+ <email>user84@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000085</uid>
+ <guid>10000000-0000-0000-0000-000000000085</guid>
+ <short-name>user85</short-name>
+ <password>user85</password>
+ <full-name>User 85</full-name>
+ <email>user85@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000086</uid>
+ <guid>10000000-0000-0000-0000-000000000086</guid>
+ <short-name>user86</short-name>
+ <password>user86</password>
+ <full-name>User 86</full-name>
+ <email>user86@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000087</uid>
+ <guid>10000000-0000-0000-0000-000000000087</guid>
+ <short-name>user87</short-name>
+ <password>user87</password>
+ <full-name>User 87</full-name>
+ <email>user87@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000088</uid>
+ <guid>10000000-0000-0000-0000-000000000088</guid>
+ <short-name>user88</short-name>
+ <password>user88</password>
+ <full-name>User 88</full-name>
+ <email>user88@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000089</uid>
+ <guid>10000000-0000-0000-0000-000000000089</guid>
+ <short-name>user89</short-name>
+ <password>user89</password>
+ <full-name>User 89</full-name>
+ <email>user89@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000090</uid>
+ <guid>10000000-0000-0000-0000-000000000090</guid>
+ <short-name>user90</short-name>
+ <password>user90</password>
+ <full-name>User 90</full-name>
+ <email>user90@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000091</uid>
+ <guid>10000000-0000-0000-0000-000000000091</guid>
+ <short-name>user91</short-name>
+ <password>user91</password>
+ <full-name>User 91</full-name>
+ <email>user91@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000092</uid>
+ <guid>10000000-0000-0000-0000-000000000092</guid>
+ <short-name>user92</short-name>
+ <password>user92</password>
+ <full-name>User 92</full-name>
+ <email>user92@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000093</uid>
+ <guid>10000000-0000-0000-0000-000000000093</guid>
+ <short-name>user93</short-name>
+ <password>user93</password>
+ <full-name>User 93</full-name>
+ <email>user93@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000094</uid>
+ <guid>10000000-0000-0000-0000-000000000094</guid>
+ <short-name>user94</short-name>
+ <password>user94</password>
+ <full-name>User 94</full-name>
+ <email>user94@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000095</uid>
+ <guid>10000000-0000-0000-0000-000000000095</guid>
+ <short-name>user95</short-name>
+ <password>user95</password>
+ <full-name>User 95</full-name>
+ <email>user95@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000096</uid>
+ <guid>10000000-0000-0000-0000-000000000096</guid>
+ <short-name>user96</short-name>
+ <password>user96</password>
+ <full-name>User 96</full-name>
+ <email>user96@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000097</uid>
+ <guid>10000000-0000-0000-0000-000000000097</guid>
+ <short-name>user97</short-name>
+ <password>user97</password>
+ <full-name>User 97</full-name>
+ <email>user97@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000098</uid>
+ <guid>10000000-0000-0000-0000-000000000098</guid>
+ <short-name>user98</short-name>
+ <password>user98</password>
+ <full-name>User 98</full-name>
+ <email>user98@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000099</uid>
+ <guid>10000000-0000-0000-0000-000000000099</guid>
+ <short-name>user99</short-name>
+ <password>user99</password>
+ <full-name>User 99</full-name>
+ <email>user99@example.com</email>
+</record>
+<record type="user">
+ <uid>10000000-0000-0000-0000-000000000100</uid>
+ <guid>10000000-0000-0000-0000-000000000100</guid>
+ <short-name>user100</short-name>
+ <password>user100</password>
+ <full-name>User 100</full-name>
+ <email>user100@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000001</uid>
+ <guid>60000000-0000-0000-0000-000000000001</guid>
+ <short-name>puser01</short-name>
+ <password>puser01</password>
+ <full-name>Puser 01</full-name>
+ <email>puser01@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000002</uid>
+ <guid>60000000-0000-0000-0000-000000000002</guid>
+ <short-name>puser02</short-name>
+ <password>puser02</password>
+ <full-name>Puser 02</full-name>
+ <email>puser02@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000003</uid>
+ <guid>60000000-0000-0000-0000-000000000003</guid>
+ <short-name>puser03</short-name>
+ <password>puser03</password>
+ <full-name>Puser 03</full-name>
+ <email>puser03@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000004</uid>
+ <guid>60000000-0000-0000-0000-000000000004</guid>
+ <short-name>puser04</short-name>
+ <password>puser04</password>
+ <full-name>Puser 04</full-name>
+ <email>puser04@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000005</uid>
+ <guid>60000000-0000-0000-0000-000000000005</guid>
+ <short-name>puser05</short-name>
+ <password>puser05</password>
+ <full-name>Puser 05</full-name>
+ <email>puser05@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000006</uid>
+ <guid>60000000-0000-0000-0000-000000000006</guid>
+ <short-name>puser06</short-name>
+ <password>puser06</password>
+ <full-name>Puser 06</full-name>
+ <email>puser06@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000007</uid>
+ <guid>60000000-0000-0000-0000-000000000007</guid>
+ <short-name>puser07</short-name>
+ <password>puser07</password>
+ <full-name>Puser 07</full-name>
+ <email>puser07@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000008</uid>
+ <guid>60000000-0000-0000-0000-000000000008</guid>
+ <short-name>puser08</short-name>
+ <password>puser08</password>
+ <full-name>Puser 08</full-name>
+ <email>puser08@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000009</uid>
+ <guid>60000000-0000-0000-0000-000000000009</guid>
+ <short-name>puser09</short-name>
+ <password>puser09</password>
+ <full-name>Puser 09</full-name>
+ <email>puser09@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000010</uid>
+ <guid>60000000-0000-0000-0000-000000000010</guid>
+ <short-name>puser10</short-name>
+ <password>puser10</password>
+ <full-name>Puser 10</full-name>
+ <email>puser10@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000011</uid>
+ <guid>60000000-0000-0000-0000-000000000011</guid>
+ <short-name>puser11</short-name>
+ <password>puser11</password>
+ <full-name>Puser 11</full-name>
+ <email>puser11@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000012</uid>
+ <guid>60000000-0000-0000-0000-000000000012</guid>
+ <short-name>puser12</short-name>
+ <password>puser12</password>
+ <full-name>Puser 12</full-name>
+ <email>puser12@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000013</uid>
+ <guid>60000000-0000-0000-0000-000000000013</guid>
+ <short-name>puser13</short-name>
+ <password>puser13</password>
+ <full-name>Puser 13</full-name>
+ <email>puser13@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000014</uid>
+ <guid>60000000-0000-0000-0000-000000000014</guid>
+ <short-name>puser14</short-name>
+ <password>puser14</password>
+ <full-name>Puser 14</full-name>
+ <email>puser14@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000015</uid>
+ <guid>60000000-0000-0000-0000-000000000015</guid>
+ <short-name>puser15</short-name>
+ <password>puser15</password>
+ <full-name>Puser 15</full-name>
+ <email>puser15@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000016</uid>
+ <guid>60000000-0000-0000-0000-000000000016</guid>
+ <short-name>puser16</short-name>
+ <password>puser16</password>
+ <full-name>Puser 16</full-name>
+ <email>puser16@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000017</uid>
+ <guid>60000000-0000-0000-0000-000000000017</guid>
+ <short-name>puser17</short-name>
+ <password>puser17</password>
+ <full-name>Puser 17</full-name>
+ <email>puser17@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000018</uid>
+ <guid>60000000-0000-0000-0000-000000000018</guid>
+ <short-name>puser18</short-name>
+ <password>puser18</password>
+ <full-name>Puser 18</full-name>
+ <email>puser18@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000019</uid>
+ <guid>60000000-0000-0000-0000-000000000019</guid>
+ <short-name>puser19</short-name>
+ <password>puser19</password>
+ <full-name>Puser 19</full-name>
+ <email>puser19@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000020</uid>
+ <guid>60000000-0000-0000-0000-000000000020</guid>
+ <short-name>puser20</short-name>
+ <password>puser20</password>
+ <full-name>Puser 20</full-name>
+ <email>puser20@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000021</uid>
+ <guid>60000000-0000-0000-0000-000000000021</guid>
+ <short-name>puser21</short-name>
+ <password>puser21</password>
+ <full-name>Puser 21</full-name>
+ <email>puser21@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000022</uid>
+ <guid>60000000-0000-0000-0000-000000000022</guid>
+ <short-name>puser22</short-name>
+ <password>puser22</password>
+ <full-name>Puser 22</full-name>
+ <email>puser22@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000023</uid>
+ <guid>60000000-0000-0000-0000-000000000023</guid>
+ <short-name>puser23</short-name>
+ <password>puser23</password>
+ <full-name>Puser 23</full-name>
+ <email>puser23@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000024</uid>
+ <guid>60000000-0000-0000-0000-000000000024</guid>
+ <short-name>puser24</short-name>
+ <password>puser24</password>
+ <full-name>Puser 24</full-name>
+ <email>puser24@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000025</uid>
+ <guid>60000000-0000-0000-0000-000000000025</guid>
+ <short-name>puser25</short-name>
+ <password>puser25</password>
+ <full-name>Puser 25</full-name>
+ <email>puser25@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000026</uid>
+ <guid>60000000-0000-0000-0000-000000000026</guid>
+ <short-name>puser26</short-name>
+ <password>puser26</password>
+ <full-name>Puser 26</full-name>
+ <email>puser26@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000027</uid>
+ <guid>60000000-0000-0000-0000-000000000027</guid>
+ <short-name>puser27</short-name>
+ <password>puser27</password>
+ <full-name>Puser 27</full-name>
+ <email>puser27@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000028</uid>
+ <guid>60000000-0000-0000-0000-000000000028</guid>
+ <short-name>puser28</short-name>
+ <password>puser28</password>
+ <full-name>Puser 28</full-name>
+ <email>puser28@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000029</uid>
+ <guid>60000000-0000-0000-0000-000000000029</guid>
+ <short-name>puser29</short-name>
+ <password>puser29</password>
+ <full-name>Puser 29</full-name>
+ <email>puser29@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000030</uid>
+ <guid>60000000-0000-0000-0000-000000000030</guid>
+ <short-name>puser30</short-name>
+ <password>puser30</password>
+ <full-name>Puser 30</full-name>
+ <email>puser30@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000031</uid>
+ <guid>60000000-0000-0000-0000-000000000031</guid>
+ <short-name>puser31</short-name>
+ <password>puser31</password>
+ <full-name>Puser 31</full-name>
+ <email>puser31@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000032</uid>
+ <guid>60000000-0000-0000-0000-000000000032</guid>
+ <short-name>puser32</short-name>
+ <password>puser32</password>
+ <full-name>Puser 32</full-name>
+ <email>puser32@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000033</uid>
+ <guid>60000000-0000-0000-0000-000000000033</guid>
+ <short-name>puser33</short-name>
+ <password>puser33</password>
+ <full-name>Puser 33</full-name>
+ <email>puser33@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000034</uid>
+ <guid>60000000-0000-0000-0000-000000000034</guid>
+ <short-name>puser34</short-name>
+ <password>puser34</password>
+ <full-name>Puser 34</full-name>
+ <email>puser34@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000035</uid>
+ <guid>60000000-0000-0000-0000-000000000035</guid>
+ <short-name>puser35</short-name>
+ <password>puser35</password>
+ <full-name>Puser 35</full-name>
+ <email>puser35@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000036</uid>
+ <guid>60000000-0000-0000-0000-000000000036</guid>
+ <short-name>puser36</short-name>
+ <password>puser36</password>
+ <full-name>Puser 36</full-name>
+ <email>puser36@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000037</uid>
+ <guid>60000000-0000-0000-0000-000000000037</guid>
+ <short-name>puser37</short-name>
+ <password>puser37</password>
+ <full-name>Puser 37</full-name>
+ <email>puser37@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000038</uid>
+ <guid>60000000-0000-0000-0000-000000000038</guid>
+ <short-name>puser38</short-name>
+ <password>puser38</password>
+ <full-name>Puser 38</full-name>
+ <email>puser38@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000039</uid>
+ <guid>60000000-0000-0000-0000-000000000039</guid>
+ <short-name>puser39</short-name>
+ <password>puser39</password>
+ <full-name>Puser 39</full-name>
+ <email>puser39@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000040</uid>
+ <guid>60000000-0000-0000-0000-000000000040</guid>
+ <short-name>puser40</short-name>
+ <password>puser40</password>
+ <full-name>Puser 40</full-name>
+ <email>puser40@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000041</uid>
+ <guid>60000000-0000-0000-0000-000000000041</guid>
+ <short-name>puser41</short-name>
+ <password>puser41</password>
+ <full-name>Puser 41</full-name>
+ <email>puser41@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000042</uid>
+ <guid>60000000-0000-0000-0000-000000000042</guid>
+ <short-name>puser42</short-name>
+ <password>puser42</password>
+ <full-name>Puser 42</full-name>
+ <email>puser42@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000043</uid>
+ <guid>60000000-0000-0000-0000-000000000043</guid>
+ <short-name>puser43</short-name>
+ <password>puser43</password>
+ <full-name>Puser 43</full-name>
+ <email>puser43@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000044</uid>
+ <guid>60000000-0000-0000-0000-000000000044</guid>
+ <short-name>puser44</short-name>
+ <password>puser44</password>
+ <full-name>Puser 44</full-name>
+ <email>puser44@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000045</uid>
+ <guid>60000000-0000-0000-0000-000000000045</guid>
+ <short-name>puser45</short-name>
+ <password>puser45</password>
+ <full-name>Puser 45</full-name>
+ <email>puser45@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000046</uid>
+ <guid>60000000-0000-0000-0000-000000000046</guid>
+ <short-name>puser46</short-name>
+ <password>puser46</password>
+ <full-name>Puser 46</full-name>
+ <email>puser46@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000047</uid>
+ <guid>60000000-0000-0000-0000-000000000047</guid>
+ <short-name>puser47</short-name>
+ <password>puser47</password>
+ <full-name>Puser 47</full-name>
+ <email>puser47@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000048</uid>
+ <guid>60000000-0000-0000-0000-000000000048</guid>
+ <short-name>puser48</short-name>
+ <password>puser48</password>
+ <full-name>Puser 48</full-name>
+ <email>puser48@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000049</uid>
+ <guid>60000000-0000-0000-0000-000000000049</guid>
+ <short-name>puser49</short-name>
+ <password>puser49</password>
+ <full-name>Puser 49</full-name>
+ <email>puser49@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000050</uid>
+ <guid>60000000-0000-0000-0000-000000000050</guid>
+ <short-name>puser50</short-name>
+ <password>puser50</password>
+ <full-name>Puser 50</full-name>
+ <email>puser50@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000051</uid>
+ <guid>60000000-0000-0000-0000-000000000051</guid>
+ <short-name>puser51</short-name>
+ <password>puser51</password>
+ <full-name>Puser 51</full-name>
+ <email>puser51@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000052</uid>
+ <guid>60000000-0000-0000-0000-000000000052</guid>
+ <short-name>puser52</short-name>
+ <password>puser52</password>
+ <full-name>Puser 52</full-name>
+ <email>puser52@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000053</uid>
+ <guid>60000000-0000-0000-0000-000000000053</guid>
+ <short-name>puser53</short-name>
+ <password>puser53</password>
+ <full-name>Puser 53</full-name>
+ <email>puser53@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000054</uid>
+ <guid>60000000-0000-0000-0000-000000000054</guid>
+ <short-name>puser54</short-name>
+ <password>puser54</password>
+ <full-name>Puser 54</full-name>
+ <email>puser54@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000055</uid>
+ <guid>60000000-0000-0000-0000-000000000055</guid>
+ <short-name>puser55</short-name>
+ <password>puser55</password>
+ <full-name>Puser 55</full-name>
+ <email>puser55@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000056</uid>
+ <guid>60000000-0000-0000-0000-000000000056</guid>
+ <short-name>puser56</short-name>
+ <password>puser56</password>
+ <full-name>Puser 56</full-name>
+ <email>puser56@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000057</uid>
+ <guid>60000000-0000-0000-0000-000000000057</guid>
+ <short-name>puser57</short-name>
+ <password>puser57</password>
+ <full-name>Puser 57</full-name>
+ <email>puser57@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000058</uid>
+ <guid>60000000-0000-0000-0000-000000000058</guid>
+ <short-name>puser58</short-name>
+ <password>puser58</password>
+ <full-name>Puser 58</full-name>
+ <email>puser58@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000059</uid>
+ <guid>60000000-0000-0000-0000-000000000059</guid>
+ <short-name>puser59</short-name>
+ <password>puser59</password>
+ <full-name>Puser 59</full-name>
+ <email>puser59@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000060</uid>
+ <guid>60000000-0000-0000-0000-000000000060</guid>
+ <short-name>puser60</short-name>
+ <password>puser60</password>
+ <full-name>Puser 60</full-name>
+ <email>puser60@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000061</uid>
+ <guid>60000000-0000-0000-0000-000000000061</guid>
+ <short-name>puser61</short-name>
+ <password>puser61</password>
+ <full-name>Puser 61</full-name>
+ <email>puser61@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000062</uid>
+ <guid>60000000-0000-0000-0000-000000000062</guid>
+ <short-name>puser62</short-name>
+ <password>puser62</password>
+ <full-name>Puser 62</full-name>
+ <email>puser62@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000063</uid>
+ <guid>60000000-0000-0000-0000-000000000063</guid>
+ <short-name>puser63</short-name>
+ <password>puser63</password>
+ <full-name>Puser 63</full-name>
+ <email>puser63@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000064</uid>
+ <guid>60000000-0000-0000-0000-000000000064</guid>
+ <short-name>puser64</short-name>
+ <password>puser64</password>
+ <full-name>Puser 64</full-name>
+ <email>puser64@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000065</uid>
+ <guid>60000000-0000-0000-0000-000000000065</guid>
+ <short-name>puser65</short-name>
+ <password>puser65</password>
+ <full-name>Puser 65</full-name>
+ <email>puser65@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000066</uid>
+ <guid>60000000-0000-0000-0000-000000000066</guid>
+ <short-name>puser66</short-name>
+ <password>puser66</password>
+ <full-name>Puser 66</full-name>
+ <email>puser66@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000067</uid>
+ <guid>60000000-0000-0000-0000-000000000067</guid>
+ <short-name>puser67</short-name>
+ <password>puser67</password>
+ <full-name>Puser 67</full-name>
+ <email>puser67@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000068</uid>
+ <guid>60000000-0000-0000-0000-000000000068</guid>
+ <short-name>puser68</short-name>
+ <password>puser68</password>
+ <full-name>Puser 68</full-name>
+ <email>puser68@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000069</uid>
+ <guid>60000000-0000-0000-0000-000000000069</guid>
+ <short-name>puser69</short-name>
+ <password>puser69</password>
+ <full-name>Puser 69</full-name>
+ <email>puser69@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000070</uid>
+ <guid>60000000-0000-0000-0000-000000000070</guid>
+ <short-name>puser70</short-name>
+ <password>puser70</password>
+ <full-name>Puser 70</full-name>
+ <email>puser70@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000071</uid>
+ <guid>60000000-0000-0000-0000-000000000071</guid>
+ <short-name>puser71</short-name>
+ <password>puser71</password>
+ <full-name>Puser 71</full-name>
+ <email>puser71@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000072</uid>
+ <guid>60000000-0000-0000-0000-000000000072</guid>
+ <short-name>puser72</short-name>
+ <password>puser72</password>
+ <full-name>Puser 72</full-name>
+ <email>puser72@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000073</uid>
+ <guid>60000000-0000-0000-0000-000000000073</guid>
+ <short-name>puser73</short-name>
+ <password>puser73</password>
+ <full-name>Puser 73</full-name>
+ <email>puser73@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000074</uid>
+ <guid>60000000-0000-0000-0000-000000000074</guid>
+ <short-name>puser74</short-name>
+ <password>puser74</password>
+ <full-name>Puser 74</full-name>
+ <email>puser74@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000075</uid>
+ <guid>60000000-0000-0000-0000-000000000075</guid>
+ <short-name>puser75</short-name>
+ <password>puser75</password>
+ <full-name>Puser 75</full-name>
+ <email>puser75@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000076</uid>
+ <guid>60000000-0000-0000-0000-000000000076</guid>
+ <short-name>puser76</short-name>
+ <password>puser76</password>
+ <full-name>Puser 76</full-name>
+ <email>puser76@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000077</uid>
+ <guid>60000000-0000-0000-0000-000000000077</guid>
+ <short-name>puser77</short-name>
+ <password>puser77</password>
+ <full-name>Puser 77</full-name>
+ <email>puser77@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000078</uid>
+ <guid>60000000-0000-0000-0000-000000000078</guid>
+ <short-name>puser78</short-name>
+ <password>puser78</password>
+ <full-name>Puser 78</full-name>
+ <email>puser78@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000079</uid>
+ <guid>60000000-0000-0000-0000-000000000079</guid>
+ <short-name>puser79</short-name>
+ <password>puser79</password>
+ <full-name>Puser 79</full-name>
+ <email>puser79@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000080</uid>
+ <guid>60000000-0000-0000-0000-000000000080</guid>
+ <short-name>puser80</short-name>
+ <password>puser80</password>
+ <full-name>Puser 80</full-name>
+ <email>puser80@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000081</uid>
+ <guid>60000000-0000-0000-0000-000000000081</guid>
+ <short-name>puser81</short-name>
+ <password>puser81</password>
+ <full-name>Puser 81</full-name>
+ <email>puser81@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000082</uid>
+ <guid>60000000-0000-0000-0000-000000000082</guid>
+ <short-name>puser82</short-name>
+ <password>puser82</password>
+ <full-name>Puser 82</full-name>
+ <email>puser82@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000083</uid>
+ <guid>60000000-0000-0000-0000-000000000083</guid>
+ <short-name>puser83</short-name>
+ <password>puser83</password>
+ <full-name>Puser 83</full-name>
+ <email>puser83@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000084</uid>
+ <guid>60000000-0000-0000-0000-000000000084</guid>
+ <short-name>puser84</short-name>
+ <password>puser84</password>
+ <full-name>Puser 84</full-name>
+ <email>puser84@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000085</uid>
+ <guid>60000000-0000-0000-0000-000000000085</guid>
+ <short-name>puser85</short-name>
+ <password>puser85</password>
+ <full-name>Puser 85</full-name>
+ <email>puser85@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000086</uid>
+ <guid>60000000-0000-0000-0000-000000000086</guid>
+ <short-name>puser86</short-name>
+ <password>puser86</password>
+ <full-name>Puser 86</full-name>
+ <email>puser86@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000087</uid>
+ <guid>60000000-0000-0000-0000-000000000087</guid>
+ <short-name>puser87</short-name>
+ <password>puser87</password>
+ <full-name>Puser 87</full-name>
+ <email>puser87@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000088</uid>
+ <guid>60000000-0000-0000-0000-000000000088</guid>
+ <short-name>puser88</short-name>
+ <password>puser88</password>
+ <full-name>Puser 88</full-name>
+ <email>puser88@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000089</uid>
+ <guid>60000000-0000-0000-0000-000000000089</guid>
+ <short-name>puser89</short-name>
+ <password>puser89</password>
+ <full-name>Puser 89</full-name>
+ <email>puser89@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000090</uid>
+ <guid>60000000-0000-0000-0000-000000000090</guid>
+ <short-name>puser90</short-name>
+ <password>puser90</password>
+ <full-name>Puser 90</full-name>
+ <email>puser90@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000091</uid>
+ <guid>60000000-0000-0000-0000-000000000091</guid>
+ <short-name>puser91</short-name>
+ <password>puser91</password>
+ <full-name>Puser 91</full-name>
+ <email>puser91@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000092</uid>
+ <guid>60000000-0000-0000-0000-000000000092</guid>
+ <short-name>puser92</short-name>
+ <password>puser92</password>
+ <full-name>Puser 92</full-name>
+ <email>puser92@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000093</uid>
+ <guid>60000000-0000-0000-0000-000000000093</guid>
+ <short-name>puser93</short-name>
+ <password>puser93</password>
+ <full-name>Puser 93</full-name>
+ <email>puser93@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000094</uid>
+ <guid>60000000-0000-0000-0000-000000000094</guid>
+ <short-name>puser94</short-name>
+ <password>puser94</password>
+ <full-name>Puser 94</full-name>
+ <email>puser94@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000095</uid>
+ <guid>60000000-0000-0000-0000-000000000095</guid>
+ <short-name>puser95</short-name>
+ <password>puser95</password>
+ <full-name>Puser 95</full-name>
+ <email>puser95@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000096</uid>
+ <guid>60000000-0000-0000-0000-000000000096</guid>
+ <short-name>puser96</short-name>
+ <password>puser96</password>
+ <full-name>Puser 96</full-name>
+ <email>puser96@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000097</uid>
+ <guid>60000000-0000-0000-0000-000000000097</guid>
+ <short-name>puser97</short-name>
+ <password>puser97</password>
+ <full-name>Puser 97</full-name>
+ <email>puser97@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000098</uid>
+ <guid>60000000-0000-0000-0000-000000000098</guid>
+ <short-name>puser98</short-name>
+ <password>puser98</password>
+ <full-name>Puser 98</full-name>
+ <email>puser98@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000099</uid>
+ <guid>60000000-0000-0000-0000-000000000099</guid>
+ <short-name>puser99</short-name>
+ <password>puser99</password>
+ <full-name>Puser 99</full-name>
+ <email>puser99@example.com</email>
+</record>
+<record type="user">
+ <uid>60000000-0000-0000-0000-000000000100</uid>
+ <guid>60000000-0000-0000-0000-000000000100</guid>
+ <short-name>puser100</short-name>
+ <password>puser100</password>
+ <full-name>Puser 100</full-name>
+ <email>puser100@example.com</email>
+</record>
+</directory>
</ins></span></pre></div>
<a id="CalendarServertrunkconfauthaccountstests2sxml"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/auth/accounts-test-s2s.xml (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/accounts-test-s2s.xml (rev 0)
+++ CalendarServer/trunk/conf/auth/accounts-test-s2s.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,830 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
+<directory realm="Test Realm 2">
+<record>
+ <uid>82A5A2FA-F8FD-4761-B1CB-F1664C1F376A</uid>
+ <guid>82A5A2FA-F8FD-4761-B1CB-F1664C1F376A</guid>
+ <short-name>admin</short-name>
+ <password>admin</password>
+ <full-name>Super User</full-name>
+ <email>admin@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000001</uid>
+ <guid>70000000-0000-0000-0000-000000000001</guid>
+ <short-name>other01</short-name>
+ <password>other01</password>
+ <full-name>Other 01</full-name>
+ <email>other01@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000002</uid>
+ <guid>70000000-0000-0000-0000-000000000002</guid>
+ <short-name>other02</short-name>
+ <password>other02</password>
+ <full-name>Other 02</full-name>
+ <email>other02@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000003</uid>
+ <guid>70000000-0000-0000-0000-000000000003</guid>
+ <short-name>other03</short-name>
+ <password>other03</password>
+ <full-name>Other 03</full-name>
+ <email>other03@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000004</uid>
+ <guid>70000000-0000-0000-0000-000000000004</guid>
+ <short-name>other04</short-name>
+ <password>other04</password>
+ <full-name>Other 04</full-name>
+ <email>other04@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000005</uid>
+ <guid>70000000-0000-0000-0000-000000000005</guid>
+ <short-name>other05</short-name>
+ <password>other05</password>
+ <full-name>Other 05</full-name>
+ <email>other05@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000006</uid>
+ <guid>70000000-0000-0000-0000-000000000006</guid>
+ <short-name>other06</short-name>
+ <password>other06</password>
+ <full-name>Other 06</full-name>
+ <email>other06@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000007</uid>
+ <guid>70000000-0000-0000-0000-000000000007</guid>
+ <short-name>other07</short-name>
+ <password>other07</password>
+ <full-name>Other 07</full-name>
+ <email>other07@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000008</uid>
+ <guid>70000000-0000-0000-0000-000000000008</guid>
+ <short-name>other08</short-name>
+ <password>other08</password>
+ <full-name>Other 08</full-name>
+ <email>other08@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000009</uid>
+ <guid>70000000-0000-0000-0000-000000000009</guid>
+ <short-name>other09</short-name>
+ <password>other09</password>
+ <full-name>Other 09</full-name>
+ <email>other09@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000010</uid>
+ <guid>70000000-0000-0000-0000-000000000010</guid>
+ <short-name>other10</short-name>
+ <password>other10</password>
+ <full-name>Other 10</full-name>
+ <email>other10@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000011</uid>
+ <guid>70000000-0000-0000-0000-000000000011</guid>
+ <short-name>other11</short-name>
+ <password>other11</password>
+ <full-name>Other 11</full-name>
+ <email>other11@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000012</uid>
+ <guid>70000000-0000-0000-0000-000000000012</guid>
+ <short-name>other12</short-name>
+ <password>other12</password>
+ <full-name>Other 12</full-name>
+ <email>other12@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000013</uid>
+ <guid>70000000-0000-0000-0000-000000000013</guid>
+ <short-name>other13</short-name>
+ <password>other13</password>
+ <full-name>Other 13</full-name>
+ <email>other13@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000014</uid>
+ <guid>70000000-0000-0000-0000-000000000014</guid>
+ <short-name>other14</short-name>
+ <password>other14</password>
+ <full-name>Other 14</full-name>
+ <email>other14@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000015</uid>
+ <guid>70000000-0000-0000-0000-000000000015</guid>
+ <short-name>other15</short-name>
+ <password>other15</password>
+ <full-name>Other 15</full-name>
+ <email>other15@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000016</uid>
+ <guid>70000000-0000-0000-0000-000000000016</guid>
+ <short-name>other16</short-name>
+ <password>other16</password>
+ <full-name>Other 16</full-name>
+ <email>other16@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000017</uid>
+ <guid>70000000-0000-0000-0000-000000000017</guid>
+ <short-name>other17</short-name>
+ <password>other17</password>
+ <full-name>Other 17</full-name>
+ <email>other17@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000018</uid>
+ <guid>70000000-0000-0000-0000-000000000018</guid>
+ <short-name>other18</short-name>
+ <password>other18</password>
+ <full-name>Other 18</full-name>
+ <email>other18@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000019</uid>
+ <guid>70000000-0000-0000-0000-000000000019</guid>
+ <short-name>other19</short-name>
+ <password>other19</password>
+ <full-name>Other 19</full-name>
+ <email>other19@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000020</uid>
+ <guid>70000000-0000-0000-0000-000000000020</guid>
+ <short-name>other20</short-name>
+ <password>other20</password>
+ <full-name>Other 20</full-name>
+ <email>other20@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000021</uid>
+ <guid>70000000-0000-0000-0000-000000000021</guid>
+ <short-name>other21</short-name>
+ <password>other21</password>
+ <full-name>Other 21</full-name>
+ <email>other21@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000022</uid>
+ <guid>70000000-0000-0000-0000-000000000022</guid>
+ <short-name>other22</short-name>
+ <password>other22</password>
+ <full-name>Other 22</full-name>
+ <email>other22@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000023</uid>
+ <guid>70000000-0000-0000-0000-000000000023</guid>
+ <short-name>other23</short-name>
+ <password>other23</password>
+ <full-name>Other 23</full-name>
+ <email>other23@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000024</uid>
+ <guid>70000000-0000-0000-0000-000000000024</guid>
+ <short-name>other24</short-name>
+ <password>other24</password>
+ <full-name>Other 24</full-name>
+ <email>other24@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000025</uid>
+ <guid>70000000-0000-0000-0000-000000000025</guid>
+ <short-name>other25</short-name>
+ <password>other25</password>
+ <full-name>Other 25</full-name>
+ <email>other25@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000026</uid>
+ <guid>70000000-0000-0000-0000-000000000026</guid>
+ <short-name>other26</short-name>
+ <password>other26</password>
+ <full-name>Other 26</full-name>
+ <email>other26@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000027</uid>
+ <guid>70000000-0000-0000-0000-000000000027</guid>
+ <short-name>other27</short-name>
+ <password>other27</password>
+ <full-name>Other 27</full-name>
+ <email>other27@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000028</uid>
+ <guid>70000000-0000-0000-0000-000000000028</guid>
+ <short-name>other28</short-name>
+ <password>other28</password>
+ <full-name>Other 28</full-name>
+ <email>other28@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000029</uid>
+ <guid>70000000-0000-0000-0000-000000000029</guid>
+ <short-name>other29</short-name>
+ <password>other29</password>
+ <full-name>Other 29</full-name>
+ <email>other29@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000030</uid>
+ <guid>70000000-0000-0000-0000-000000000030</guid>
+ <short-name>other30</short-name>
+ <password>other30</password>
+ <full-name>Other 30</full-name>
+ <email>other30@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000031</uid>
+ <guid>70000000-0000-0000-0000-000000000031</guid>
+ <short-name>other31</short-name>
+ <password>other31</password>
+ <full-name>Other 31</full-name>
+ <email>other31@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000032</uid>
+ <guid>70000000-0000-0000-0000-000000000032</guid>
+ <short-name>other32</short-name>
+ <password>other32</password>
+ <full-name>Other 32</full-name>
+ <email>other32@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000033</uid>
+ <guid>70000000-0000-0000-0000-000000000033</guid>
+ <short-name>other33</short-name>
+ <password>other33</password>
+ <full-name>Other 33</full-name>
+ <email>other33@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000034</uid>
+ <guid>70000000-0000-0000-0000-000000000034</guid>
+ <short-name>other34</short-name>
+ <password>other34</password>
+ <full-name>Other 34</full-name>
+ <email>other34@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000035</uid>
+ <guid>70000000-0000-0000-0000-000000000035</guid>
+ <short-name>other35</short-name>
+ <password>other35</password>
+ <full-name>Other 35</full-name>
+ <email>other35@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000036</uid>
+ <guid>70000000-0000-0000-0000-000000000036</guid>
+ <short-name>other36</short-name>
+ <password>other36</password>
+ <full-name>Other 36</full-name>
+ <email>other36@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000037</uid>
+ <guid>70000000-0000-0000-0000-000000000037</guid>
+ <short-name>other37</short-name>
+ <password>other37</password>
+ <full-name>Other 37</full-name>
+ <email>other37@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000038</uid>
+ <guid>70000000-0000-0000-0000-000000000038</guid>
+ <short-name>other38</short-name>
+ <password>other38</password>
+ <full-name>Other 38</full-name>
+ <email>other38@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000039</uid>
+ <guid>70000000-0000-0000-0000-000000000039</guid>
+ <short-name>other39</short-name>
+ <password>other39</password>
+ <full-name>Other 39</full-name>
+ <email>other39@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000040</uid>
+ <guid>70000000-0000-0000-0000-000000000040</guid>
+ <short-name>other40</short-name>
+ <password>other40</password>
+ <full-name>Other 40</full-name>
+ <email>other40@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000041</uid>
+ <guid>70000000-0000-0000-0000-000000000041</guid>
+ <short-name>other41</short-name>
+ <password>other41</password>
+ <full-name>Other 41</full-name>
+ <email>other41@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000042</uid>
+ <guid>70000000-0000-0000-0000-000000000042</guid>
+ <short-name>other42</short-name>
+ <password>other42</password>
+ <full-name>Other 42</full-name>
+ <email>other42@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000043</uid>
+ <guid>70000000-0000-0000-0000-000000000043</guid>
+ <short-name>other43</short-name>
+ <password>other43</password>
+ <full-name>Other 43</full-name>
+ <email>other43@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000044</uid>
+ <guid>70000000-0000-0000-0000-000000000044</guid>
+ <short-name>other44</short-name>
+ <password>other44</password>
+ <full-name>Other 44</full-name>
+ <email>other44@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000045</uid>
+ <guid>70000000-0000-0000-0000-000000000045</guid>
+ <short-name>other45</short-name>
+ <password>other45</password>
+ <full-name>Other 45</full-name>
+ <email>other45@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000046</uid>
+ <guid>70000000-0000-0000-0000-000000000046</guid>
+ <short-name>other46</short-name>
+ <password>other46</password>
+ <full-name>Other 46</full-name>
+ <email>other46@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000047</uid>
+ <guid>70000000-0000-0000-0000-000000000047</guid>
+ <short-name>other47</short-name>
+ <password>other47</password>
+ <full-name>Other 47</full-name>
+ <email>other47@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000048</uid>
+ <guid>70000000-0000-0000-0000-000000000048</guid>
+ <short-name>other48</short-name>
+ <password>other48</password>
+ <full-name>Other 48</full-name>
+ <email>other48@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000049</uid>
+ <guid>70000000-0000-0000-0000-000000000049</guid>
+ <short-name>other49</short-name>
+ <password>other49</password>
+ <full-name>Other 49</full-name>
+ <email>other49@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000050</uid>
+ <guid>70000000-0000-0000-0000-000000000050</guid>
+ <short-name>other50</short-name>
+ <password>other50</password>
+ <full-name>Other 50</full-name>
+ <email>other50@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000051</uid>
+ <guid>70000000-0000-0000-0000-000000000051</guid>
+ <short-name>other51</short-name>
+ <password>other51</password>
+ <full-name>Other 51</full-name>
+ <email>other51@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000052</uid>
+ <guid>70000000-0000-0000-0000-000000000052</guid>
+ <short-name>other52</short-name>
+ <password>other52</password>
+ <full-name>Other 52</full-name>
+ <email>other52@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000053</uid>
+ <guid>70000000-0000-0000-0000-000000000053</guid>
+ <short-name>other53</short-name>
+ <password>other53</password>
+ <full-name>Other 53</full-name>
+ <email>other53@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000054</uid>
+ <guid>70000000-0000-0000-0000-000000000054</guid>
+ <short-name>other54</short-name>
+ <password>other54</password>
+ <full-name>Other 54</full-name>
+ <email>other54@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000055</uid>
+ <guid>70000000-0000-0000-0000-000000000055</guid>
+ <short-name>other55</short-name>
+ <password>other55</password>
+ <full-name>Other 55</full-name>
+ <email>other55@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000056</uid>
+ <guid>70000000-0000-0000-0000-000000000056</guid>
+ <short-name>other56</short-name>
+ <password>other56</password>
+ <full-name>Other 56</full-name>
+ <email>other56@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000057</uid>
+ <guid>70000000-0000-0000-0000-000000000057</guid>
+ <short-name>other57</short-name>
+ <password>other57</password>
+ <full-name>Other 57</full-name>
+ <email>other57@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000058</uid>
+ <guid>70000000-0000-0000-0000-000000000058</guid>
+ <short-name>other58</short-name>
+ <password>other58</password>
+ <full-name>Other 58</full-name>
+ <email>other58@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000059</uid>
+ <guid>70000000-0000-0000-0000-000000000059</guid>
+ <short-name>other59</short-name>
+ <password>other59</password>
+ <full-name>Other 59</full-name>
+ <email>other59@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000060</uid>
+ <guid>70000000-0000-0000-0000-000000000060</guid>
+ <short-name>other60</short-name>
+ <password>other60</password>
+ <full-name>Other 60</full-name>
+ <email>other60@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000061</uid>
+ <guid>70000000-0000-0000-0000-000000000061</guid>
+ <short-name>other61</short-name>
+ <password>other61</password>
+ <full-name>Other 61</full-name>
+ <email>other61@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000062</uid>
+ <guid>70000000-0000-0000-0000-000000000062</guid>
+ <short-name>other62</short-name>
+ <password>other62</password>
+ <full-name>Other 62</full-name>
+ <email>other62@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000063</uid>
+ <guid>70000000-0000-0000-0000-000000000063</guid>
+ <short-name>other63</short-name>
+ <password>other63</password>
+ <full-name>Other 63</full-name>
+ <email>other63@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000064</uid>
+ <guid>70000000-0000-0000-0000-000000000064</guid>
+ <short-name>other64</short-name>
+ <password>other64</password>
+ <full-name>Other 64</full-name>
+ <email>other64@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000065</uid>
+ <guid>70000000-0000-0000-0000-000000000065</guid>
+ <short-name>other65</short-name>
+ <password>other65</password>
+ <full-name>Other 65</full-name>
+ <email>other65@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000066</uid>
+ <guid>70000000-0000-0000-0000-000000000066</guid>
+ <short-name>other66</short-name>
+ <password>other66</password>
+ <full-name>Other 66</full-name>
+ <email>other66@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000067</uid>
+ <guid>70000000-0000-0000-0000-000000000067</guid>
+ <short-name>other67</short-name>
+ <password>other67</password>
+ <full-name>Other 67</full-name>
+ <email>other67@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000068</uid>
+ <guid>70000000-0000-0000-0000-000000000068</guid>
+ <short-name>other68</short-name>
+ <password>other68</password>
+ <full-name>Other 68</full-name>
+ <email>other68@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000069</uid>
+ <guid>70000000-0000-0000-0000-000000000069</guid>
+ <short-name>other69</short-name>
+ <password>other69</password>
+ <full-name>Other 69</full-name>
+ <email>other69@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000070</uid>
+ <guid>70000000-0000-0000-0000-000000000070</guid>
+ <short-name>other70</short-name>
+ <password>other70</password>
+ <full-name>Other 70</full-name>
+ <email>other70@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000071</uid>
+ <guid>70000000-0000-0000-0000-000000000071</guid>
+ <short-name>other71</short-name>
+ <password>other71</password>
+ <full-name>Other 71</full-name>
+ <email>other71@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000072</uid>
+ <guid>70000000-0000-0000-0000-000000000072</guid>
+ <short-name>other72</short-name>
+ <password>other72</password>
+ <full-name>Other 72</full-name>
+ <email>other72@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000073</uid>
+ <guid>70000000-0000-0000-0000-000000000073</guid>
+ <short-name>other73</short-name>
+ <password>other73</password>
+ <full-name>Other 73</full-name>
+ <email>other73@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000074</uid>
+ <guid>70000000-0000-0000-0000-000000000074</guid>
+ <short-name>other74</short-name>
+ <password>other74</password>
+ <full-name>Other 74</full-name>
+ <email>other74@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000075</uid>
+ <guid>70000000-0000-0000-0000-000000000075</guid>
+ <short-name>other75</short-name>
+ <password>other75</password>
+ <full-name>Other 75</full-name>
+ <email>other75@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000076</uid>
+ <guid>70000000-0000-0000-0000-000000000076</guid>
+ <short-name>other76</short-name>
+ <password>other76</password>
+ <full-name>Other 76</full-name>
+ <email>other76@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000077</uid>
+ <guid>70000000-0000-0000-0000-000000000077</guid>
+ <short-name>other77</short-name>
+ <password>other77</password>
+ <full-name>Other 77</full-name>
+ <email>other77@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000078</uid>
+ <guid>70000000-0000-0000-0000-000000000078</guid>
+ <short-name>other78</short-name>
+ <password>other78</password>
+ <full-name>Other 78</full-name>
+ <email>other78@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000079</uid>
+ <guid>70000000-0000-0000-0000-000000000079</guid>
+ <short-name>other79</short-name>
+ <password>other79</password>
+ <full-name>Other 79</full-name>
+ <email>other79@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000080</uid>
+ <guid>70000000-0000-0000-0000-000000000080</guid>
+ <short-name>other80</short-name>
+ <password>other80</password>
+ <full-name>Other 80</full-name>
+ <email>other80@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000081</uid>
+ <guid>70000000-0000-0000-0000-000000000081</guid>
+ <short-name>other81</short-name>
+ <password>other81</password>
+ <full-name>Other 81</full-name>
+ <email>other81@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000082</uid>
+ <guid>70000000-0000-0000-0000-000000000082</guid>
+ <short-name>other82</short-name>
+ <password>other82</password>
+ <full-name>Other 82</full-name>
+ <email>other82@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000083</uid>
+ <guid>70000000-0000-0000-0000-000000000083</guid>
+ <short-name>other83</short-name>
+ <password>other83</password>
+ <full-name>Other 83</full-name>
+ <email>other83@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000084</uid>
+ <guid>70000000-0000-0000-0000-000000000084</guid>
+ <short-name>other84</short-name>
+ <password>other84</password>
+ <full-name>Other 84</full-name>
+ <email>other84@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000085</uid>
+ <guid>70000000-0000-0000-0000-000000000085</guid>
+ <short-name>other85</short-name>
+ <password>other85</password>
+ <full-name>Other 85</full-name>
+ <email>other85@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000086</uid>
+ <guid>70000000-0000-0000-0000-000000000086</guid>
+ <short-name>other86</short-name>
+ <password>other86</password>
+ <full-name>Other 86</full-name>
+ <email>other86@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000087</uid>
+ <guid>70000000-0000-0000-0000-000000000087</guid>
+ <short-name>other87</short-name>
+ <password>other87</password>
+ <full-name>Other 87</full-name>
+ <email>other87@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000088</uid>
+ <guid>70000000-0000-0000-0000-000000000088</guid>
+ <short-name>other88</short-name>
+ <password>other88</password>
+ <full-name>Other 88</full-name>
+ <email>other88@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000089</uid>
+ <guid>70000000-0000-0000-0000-000000000089</guid>
+ <short-name>other89</short-name>
+ <password>other89</password>
+ <full-name>Other 89</full-name>
+ <email>other89@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000090</uid>
+ <guid>70000000-0000-0000-0000-000000000090</guid>
+ <short-name>other90</short-name>
+ <password>other90</password>
+ <full-name>Other 90</full-name>
+ <email>other90@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000091</uid>
+ <guid>70000000-0000-0000-0000-000000000091</guid>
+ <short-name>other91</short-name>
+ <password>other91</password>
+ <full-name>Other 91</full-name>
+ <email>other91@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000092</uid>
+ <guid>70000000-0000-0000-0000-000000000092</guid>
+ <short-name>other92</short-name>
+ <password>other92</password>
+ <full-name>Other 92</full-name>
+ <email>other92@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000093</uid>
+ <guid>70000000-0000-0000-0000-000000000093</guid>
+ <short-name>other93</short-name>
+ <password>other93</password>
+ <full-name>Other 93</full-name>
+ <email>other93@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000094</uid>
+ <guid>70000000-0000-0000-0000-000000000094</guid>
+ <short-name>other94</short-name>
+ <password>other94</password>
+ <full-name>Other 94</full-name>
+ <email>other94@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000095</uid>
+ <guid>70000000-0000-0000-0000-000000000095</guid>
+ <short-name>other95</short-name>
+ <password>other95</password>
+ <full-name>Other 95</full-name>
+ <email>other95@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000096</uid>
+ <guid>70000000-0000-0000-0000-000000000096</guid>
+ <short-name>other96</short-name>
+ <password>other96</password>
+ <full-name>Other 96</full-name>
+ <email>other96@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000097</uid>
+ <guid>70000000-0000-0000-0000-000000000097</guid>
+ <short-name>other97</short-name>
+ <password>other97</password>
+ <full-name>Other 97</full-name>
+ <email>other97@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000098</uid>
+ <guid>70000000-0000-0000-0000-000000000098</guid>
+ <short-name>other98</short-name>
+ <password>other98</password>
+ <full-name>Other 98</full-name>
+ <email>other98@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000099</uid>
+ <guid>70000000-0000-0000-0000-000000000099</guid>
+ <short-name>other99</short-name>
+ <password>other99</password>
+ <full-name>Other 99</full-name>
+ <email>other99@example.org</email>
+</record>
+<record type="user">
+ <uid>70000000-0000-0000-0000-000000000100</uid>
+ <guid>70000000-0000-0000-0000-000000000100</guid>
+ <short-name>other100</short-name>
+ <password>other100</password>
+ <full-name>Other 100</full-name>
+ <email>other100@example.org</email>
+</record>
+</directory>
</ins><span class="cx">Property changes on: CalendarServer/trunk/conf/auth/accounts-test-s2s.xml
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="CalendarServertrunkconfauthaccountstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/accounts-test.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/accounts-test.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/accounts-test.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -16,6 +16,8 @@
</span><span class="cx"> limitations under the License.
</span><span class="cx"> -->
</span><span class="cx">
</span><ins>+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
</ins><span class="cx"> <directory realm="Test Realm">
</span><span class="cx"> <record>
</span><span class="cx"> <uid>0C8BDE62-E600-4696-83D3-8B5ECABDFD2E</uid>
</span><span class="lines">@@ -42,915 +44,915 @@
</span><span class="cx"> <email>i18nuser@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user01</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000001</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000001</guid>
</span><ins>+ <short-name>user01</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user02</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000002</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000002</guid>
</span><ins>+ <short-name>user02</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user03</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000003</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000003</guid>
</span><ins>+ <short-name>user03</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user04</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000004</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000004</guid>
</span><ins>+ <short-name>user04</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user05</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000005</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000005</guid>
</span><ins>+ <short-name>user05</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user06</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000006</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000006</guid>
</span><ins>+ <short-name>user06</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user07</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000007</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000007</guid>
</span><ins>+ <short-name>user07</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user08</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000008</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000008</guid>
</span><ins>+ <short-name>user08</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user09</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000009</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000009</guid>
</span><ins>+ <short-name>user09</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user10</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000010</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000010</guid>
</span><ins>+ <short-name>user10</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user11</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000011</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000011</guid>
</span><ins>+ <short-name>user11</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user12</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000012</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000012</guid>
</span><ins>+ <short-name>user12</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user13</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000013</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000013</guid>
</span><ins>+ <short-name>user13</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user14</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000014</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000014</guid>
</span><ins>+ <short-name>user14</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user15</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000015</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000015</guid>
</span><ins>+ <short-name>user15</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user16</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000016</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000016</guid>
</span><ins>+ <short-name>user16</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user17</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000017</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000017</guid>
</span><ins>+ <short-name>user17</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user18</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000018</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000018</guid>
</span><ins>+ <short-name>user18</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user19</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000019</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000019</guid>
</span><ins>+ <short-name>user19</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user20</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000020</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000020</guid>
</span><ins>+ <short-name>user20</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user21</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000021</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000021</guid>
</span><ins>+ <short-name>user21</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user22</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000022</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000022</guid>
</span><ins>+ <short-name>user22</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user23</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000023</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000023</guid>
</span><ins>+ <short-name>user23</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user24</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000024</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000024</guid>
</span><ins>+ <short-name>user24</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user25</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000025</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000025</guid>
</span><ins>+ <short-name>user25</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user26</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000026</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000026</guid>
</span><ins>+ <short-name>user26</short-name>
</ins><span class="cx"> <password>user26</password>
</span><span class="cx"> <full-name>User 26</full-name>
</span><span class="cx"> <email>user26@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user27</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000027</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000027</guid>
</span><ins>+ <short-name>user27</short-name>
</ins><span class="cx"> <password>user27</password>
</span><span class="cx"> <full-name>User 27</full-name>
</span><span class="cx"> <email>user27@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user28</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000028</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000028</guid>
</span><ins>+ <short-name>user28</short-name>
</ins><span class="cx"> <password>user28</password>
</span><span class="cx"> <full-name>User 28</full-name>
</span><span class="cx"> <email>user28@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user29</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000029</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000029</guid>
</span><ins>+ <short-name>user29</short-name>
</ins><span class="cx"> <password>user29</password>
</span><span class="cx"> <full-name>User 29</full-name>
</span><span class="cx"> <email>user29@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user30</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000030</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000030</guid>
</span><ins>+ <short-name>user30</short-name>
</ins><span class="cx"> <password>user30</password>
</span><span class="cx"> <full-name>User 30</full-name>
</span><span class="cx"> <email>user30@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user31</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000031</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000031</guid>
</span><ins>+ <short-name>user31</short-name>
</ins><span class="cx"> <password>user31</password>
</span><span class="cx"> <full-name>User 31</full-name>
</span><span class="cx"> <email>user31@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user32</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000032</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000032</guid>
</span><ins>+ <short-name>user32</short-name>
</ins><span class="cx"> <password>user32</password>
</span><span class="cx"> <full-name>User 32</full-name>
</span><span class="cx"> <email>user32@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user33</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000033</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000033</guid>
</span><ins>+ <short-name>user33</short-name>
</ins><span class="cx"> <password>user33</password>
</span><span class="cx"> <full-name>User 33</full-name>
</span><span class="cx"> <email>user33@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user34</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000034</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000034</guid>
</span><ins>+ <short-name>user34</short-name>
</ins><span class="cx"> <password>user34</password>
</span><span class="cx"> <full-name>User 34</full-name>
</span><span class="cx"> <email>user34@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user35</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000035</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000035</guid>
</span><ins>+ <short-name>user35</short-name>
</ins><span class="cx"> <password>user35</password>
</span><span class="cx"> <full-name>User 35</full-name>
</span><span class="cx"> <email>user35@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user36</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000036</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000036</guid>
</span><ins>+ <short-name>user36</short-name>
</ins><span class="cx"> <password>user36</password>
</span><span class="cx"> <full-name>User 36</full-name>
</span><span class="cx"> <email>user36@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user37</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000037</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000037</guid>
</span><ins>+ <short-name>user37</short-name>
</ins><span class="cx"> <password>user37</password>
</span><span class="cx"> <full-name>User 37</full-name>
</span><span class="cx"> <email>user37@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user38</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000038</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000038</guid>
</span><ins>+ <short-name>user38</short-name>
</ins><span class="cx"> <password>user38</password>
</span><span class="cx"> <full-name>User 38</full-name>
</span><span class="cx"> <email>user38@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user39</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000039</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000039</guid>
</span><ins>+ <short-name>user39</short-name>
</ins><span class="cx"> <password>user39</password>
</span><span class="cx"> <full-name>User 39</full-name>
</span><span class="cx"> <email>user39@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user40</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000040</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000040</guid>
</span><ins>+ <short-name>user40</short-name>
</ins><span class="cx"> <password>user40</password>
</span><span class="cx"> <full-name>User 40</full-name>
</span><span class="cx"> <email>user40@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user41</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000041</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000041</guid>
</span><ins>+ <short-name>user41</short-name>
</ins><span class="cx"> <password>user41</password>
</span><span class="cx"> <full-name>User 41</full-name>
</span><span class="cx"> <email>user41@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user42</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000042</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000042</guid>
</span><ins>+ <short-name>user42</short-name>
</ins><span class="cx"> <password>user42</password>
</span><span class="cx"> <full-name>User 42</full-name>
</span><span class="cx"> <email>user42@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user43</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000043</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000043</guid>
</span><ins>+ <short-name>user43</short-name>
</ins><span class="cx"> <password>user43</password>
</span><span class="cx"> <full-name>User 43</full-name>
</span><span class="cx"> <email>user43@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user44</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000044</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000044</guid>
</span><ins>+ <short-name>user44</short-name>
</ins><span class="cx"> <password>user44</password>
</span><span class="cx"> <full-name>User 44</full-name>
</span><span class="cx"> <email>user44@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user45</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000045</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000045</guid>
</span><ins>+ <short-name>user45</short-name>
</ins><span class="cx"> <password>user45</password>
</span><span class="cx"> <full-name>User 45</full-name>
</span><span class="cx"> <email>user45@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user46</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000046</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000046</guid>
</span><ins>+ <short-name>user46</short-name>
</ins><span class="cx"> <password>user46</password>
</span><span class="cx"> <full-name>User 46</full-name>
</span><span class="cx"> <email>user46@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user47</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000047</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000047</guid>
</span><ins>+ <short-name>user47</short-name>
</ins><span class="cx"> <password>user47</password>
</span><span class="cx"> <full-name>User 47</full-name>
</span><span class="cx"> <email>user47@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user48</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000048</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000048</guid>
</span><ins>+ <short-name>user48</short-name>
</ins><span class="cx"> <password>user48</password>
</span><span class="cx"> <full-name>User 48</full-name>
</span><span class="cx"> <email>user48@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user49</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000049</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000049</guid>
</span><ins>+ <short-name>user49</short-name>
</ins><span class="cx"> <password>user49</password>
</span><span class="cx"> <full-name>User 49</full-name>
</span><span class="cx"> <email>user49@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user50</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000050</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000050</guid>
</span><ins>+ <short-name>user50</short-name>
</ins><span class="cx"> <password>user50</password>
</span><span class="cx"> <full-name>User 50</full-name>
</span><span class="cx"> <email>user50@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user51</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000051</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000051</guid>
</span><ins>+ <short-name>user51</short-name>
</ins><span class="cx"> <password>user51</password>
</span><span class="cx"> <full-name>User 51</full-name>
</span><span class="cx"> <email>user51@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user52</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000052</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000052</guid>
</span><ins>+ <short-name>user52</short-name>
</ins><span class="cx"> <password>user52</password>
</span><span class="cx"> <full-name>User 52</full-name>
</span><span class="cx"> <email>user52@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user53</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000053</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000053</guid>
</span><ins>+ <short-name>user53</short-name>
</ins><span class="cx"> <password>user53</password>
</span><span class="cx"> <full-name>User 53</full-name>
</span><span class="cx"> <email>user53@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user54</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000054</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000054</guid>
</span><ins>+ <short-name>user54</short-name>
</ins><span class="cx"> <password>user54</password>
</span><span class="cx"> <full-name>User 54</full-name>
</span><span class="cx"> <email>user54@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user55</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000055</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000055</guid>
</span><ins>+ <short-name>user55</short-name>
</ins><span class="cx"> <password>user55</password>
</span><span class="cx"> <full-name>User 55</full-name>
</span><span class="cx"> <email>user55@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user56</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000056</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000056</guid>
</span><ins>+ <short-name>user56</short-name>
</ins><span class="cx"> <password>user56</password>
</span><span class="cx"> <full-name>User 56</full-name>
</span><span class="cx"> <email>user56@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user57</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000057</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000057</guid>
</span><ins>+ <short-name>user57</short-name>
</ins><span class="cx"> <password>user57</password>
</span><span class="cx"> <full-name>User 57</full-name>
</span><span class="cx"> <email>user57@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user58</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000058</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000058</guid>
</span><ins>+ <short-name>user58</short-name>
</ins><span class="cx"> <password>user58</password>
</span><span class="cx"> <full-name>User 58</full-name>
</span><span class="cx"> <email>user58@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user59</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000059</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000059</guid>
</span><ins>+ <short-name>user59</short-name>
</ins><span class="cx"> <password>user59</password>
</span><span class="cx"> <full-name>User 59</full-name>
</span><span class="cx"> <email>user59@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user60</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000060</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000060</guid>
</span><ins>+ <short-name>user60</short-name>
</ins><span class="cx"> <password>user60</password>
</span><span class="cx"> <full-name>User 60</full-name>
</span><span class="cx"> <email>user60@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user61</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000061</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000061</guid>
</span><ins>+ <short-name>user61</short-name>
</ins><span class="cx"> <password>user61</password>
</span><span class="cx"> <full-name>User 61</full-name>
</span><span class="cx"> <email>user61@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user62</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000062</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000062</guid>
</span><ins>+ <short-name>user62</short-name>
</ins><span class="cx"> <password>user62</password>
</span><span class="cx"> <full-name>User 62</full-name>
</span><span class="cx"> <email>user62@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user63</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000063</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000063</guid>
</span><ins>+ <short-name>user63</short-name>
</ins><span class="cx"> <password>user63</password>
</span><span class="cx"> <full-name>User 63</full-name>
</span><span class="cx"> <email>user63@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user64</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000064</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000064</guid>
</span><ins>+ <short-name>user64</short-name>
</ins><span class="cx"> <password>user64</password>
</span><span class="cx"> <full-name>User 64</full-name>
</span><span class="cx"> <email>user64@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user65</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000065</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000065</guid>
</span><ins>+ <short-name>user65</short-name>
</ins><span class="cx"> <password>user65</password>
</span><span class="cx"> <full-name>User 65</full-name>
</span><span class="cx"> <email>user65@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user66</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000066</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000066</guid>
</span><ins>+ <short-name>user66</short-name>
</ins><span class="cx"> <password>user66</password>
</span><span class="cx"> <full-name>User 66</full-name>
</span><span class="cx"> <email>user66@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user67</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000067</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000067</guid>
</span><ins>+ <short-name>user67</short-name>
</ins><span class="cx"> <password>user67</password>
</span><span class="cx"> <full-name>User 67</full-name>
</span><span class="cx"> <email>user67@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user68</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000068</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000068</guid>
</span><ins>+ <short-name>user68</short-name>
</ins><span class="cx"> <password>user68</password>
</span><span class="cx"> <full-name>User 68</full-name>
</span><span class="cx"> <email>user68@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user69</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000069</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000069</guid>
</span><ins>+ <short-name>user69</short-name>
</ins><span class="cx"> <password>user69</password>
</span><span class="cx"> <full-name>User 69</full-name>
</span><span class="cx"> <email>user69@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user70</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000070</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000070</guid>
</span><ins>+ <short-name>user70</short-name>
</ins><span class="cx"> <password>user70</password>
</span><span class="cx"> <full-name>User 70</full-name>
</span><span class="cx"> <email>user70@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user71</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000071</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000071</guid>
</span><ins>+ <short-name>user71</short-name>
</ins><span class="cx"> <password>user71</password>
</span><span class="cx"> <full-name>User 71</full-name>
</span><span class="cx"> <email>user71@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user72</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000072</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000072</guid>
</span><ins>+ <short-name>user72</short-name>
</ins><span class="cx"> <password>user72</password>
</span><span class="cx"> <full-name>User 72</full-name>
</span><span class="cx"> <email>user72@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user73</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000073</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000073</guid>
</span><ins>+ <short-name>user73</short-name>
</ins><span class="cx"> <password>user73</password>
</span><span class="cx"> <full-name>User 73</full-name>
</span><span class="cx"> <email>user73@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user74</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000074</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000074</guid>
</span><ins>+ <short-name>user74</short-name>
</ins><span class="cx"> <password>user74</password>
</span><span class="cx"> <full-name>User 74</full-name>
</span><span class="cx"> <email>user74@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user75</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000075</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000075</guid>
</span><ins>+ <short-name>user75</short-name>
</ins><span class="cx"> <password>user75</password>
</span><span class="cx"> <full-name>User 75</full-name>
</span><span class="cx"> <email>user75@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user76</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000076</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000076</guid>
</span><ins>+ <short-name>user76</short-name>
</ins><span class="cx"> <password>user76</password>
</span><span class="cx"> <full-name>User 76</full-name>
</span><span class="cx"> <email>user76@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user77</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000077</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000077</guid>
</span><ins>+ <short-name>user77</short-name>
</ins><span class="cx"> <password>user77</password>
</span><span class="cx"> <full-name>User 77</full-name>
</span><span class="cx"> <email>user77@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user78</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000078</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000078</guid>
</span><ins>+ <short-name>user78</short-name>
</ins><span class="cx"> <password>user78</password>
</span><span class="cx"> <full-name>User 78</full-name>
</span><span class="cx"> <email>user78@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user79</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000079</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000079</guid>
</span><ins>+ <short-name>user79</short-name>
</ins><span class="cx"> <password>user79</password>
</span><span class="cx"> <full-name>User 79</full-name>
</span><span class="cx"> <email>user79@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user80</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000080</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000080</guid>
</span><ins>+ <short-name>user80</short-name>
</ins><span class="cx"> <password>user80</password>
</span><span class="cx"> <full-name>User 80</full-name>
</span><span class="cx"> <email>user80@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user81</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000081</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000081</guid>
</span><ins>+ <short-name>user81</short-name>
</ins><span class="cx"> <password>user81</password>
</span><span class="cx"> <full-name>User 81</full-name>
</span><span class="cx"> <email>user81@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user82</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000082</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000082</guid>
</span><ins>+ <short-name>user82</short-name>
</ins><span class="cx"> <password>user82</password>
</span><span class="cx"> <full-name>User 82</full-name>
</span><span class="cx"> <email>user82@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user83</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000083</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000083</guid>
</span><ins>+ <short-name>user83</short-name>
</ins><span class="cx"> <password>user83</password>
</span><span class="cx"> <full-name>User 83</full-name>
</span><span class="cx"> <email>user83@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user84</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000084</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000084</guid>
</span><ins>+ <short-name>user84</short-name>
</ins><span class="cx"> <password>user84</password>
</span><span class="cx"> <full-name>User 84</full-name>
</span><span class="cx"> <email>user84@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user85</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000085</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000085</guid>
</span><ins>+ <short-name>user85</short-name>
</ins><span class="cx"> <password>user85</password>
</span><span class="cx"> <full-name>User 85</full-name>
</span><span class="cx"> <email>user85@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user86</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000086</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000086</guid>
</span><ins>+ <short-name>user86</short-name>
</ins><span class="cx"> <password>user86</password>
</span><span class="cx"> <full-name>User 86</full-name>
</span><span class="cx"> <email>user86@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user87</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000087</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000087</guid>
</span><ins>+ <short-name>user87</short-name>
</ins><span class="cx"> <password>user87</password>
</span><span class="cx"> <full-name>User 87</full-name>
</span><span class="cx"> <email>user87@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user88</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000088</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000088</guid>
</span><ins>+ <short-name>user88</short-name>
</ins><span class="cx"> <password>user88</password>
</span><span class="cx"> <full-name>User 88</full-name>
</span><span class="cx"> <email>user88@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user89</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000089</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000089</guid>
</span><ins>+ <short-name>user89</short-name>
</ins><span class="cx"> <password>user89</password>
</span><span class="cx"> <full-name>User 89</full-name>
</span><span class="cx"> <email>user89@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user90</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000090</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000090</guid>
</span><ins>+ <short-name>user90</short-name>
</ins><span class="cx"> <password>user90</password>
</span><span class="cx"> <full-name>User 90</full-name>
</span><span class="cx"> <email>user90@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user91</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000091</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000091</guid>
</span><ins>+ <short-name>user91</short-name>
</ins><span class="cx"> <password>user91</password>
</span><span class="cx"> <full-name>User 91</full-name>
</span><span class="cx"> <email>user91@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user92</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000092</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000092</guid>
</span><ins>+ <short-name>user92</short-name>
</ins><span class="cx"> <password>user92</password>
</span><span class="cx"> <full-name>User 92</full-name>
</span><span class="cx"> <email>user92@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user93</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000093</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000093</guid>
</span><ins>+ <short-name>user93</short-name>
</ins><span class="cx"> <password>user93</password>
</span><span class="cx"> <full-name>User 93</full-name>
</span><span class="cx"> <email>user93@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user94</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000094</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000094</guid>
</span><ins>+ <short-name>user94</short-name>
</ins><span class="cx"> <password>user94</password>
</span><span class="cx"> <full-name>User 94</full-name>
</span><span class="cx"> <email>user94@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user95</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000095</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000095</guid>
</span><ins>+ <short-name>user95</short-name>
</ins><span class="cx"> <password>user95</password>
</span><span class="cx"> <full-name>User 95</full-name>
</span><span class="cx"> <email>user95@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user96</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000096</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000096</guid>
</span><ins>+ <short-name>user96</short-name>
</ins><span class="cx"> <password>user96</password>
</span><span class="cx"> <full-name>User 96</full-name>
</span><span class="cx"> <email>user96@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user97</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000097</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000097</guid>
</span><ins>+ <short-name>user97</short-name>
</ins><span class="cx"> <password>user97</password>
</span><span class="cx"> <full-name>User 97</full-name>
</span><span class="cx"> <email>user97@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user98</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000098</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000098</guid>
</span><ins>+ <short-name>user98</short-name>
</ins><span class="cx"> <password>user98</password>
</span><span class="cx"> <full-name>User 98</full-name>
</span><span class="cx"> <email>user98@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user99</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000099</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000099</guid>
</span><ins>+ <short-name>user99</short-name>
</ins><span class="cx"> <password>user99</password>
</span><span class="cx"> <full-name>User 99</full-name>
</span><span class="cx"> <email>user99@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user100</short-name>
</del><span class="cx"> <uid>10000000-0000-0000-0000-000000000100</uid>
</span><span class="cx"> <guid>10000000-0000-0000-0000-000000000100</guid>
</span><ins>+ <short-name>user100</short-name>
</ins><span class="cx"> <password>user100</password>
</span><span class="cx"> <full-name>User 100</full-name>
</span><span class="cx"> <email>user100@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public01</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000001</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000001</guid>
</span><ins>+ <short-name>public01</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public02</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000002</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000002</guid>
</span><ins>+ <short-name>public02</short-name>
</ins><span class="cx"> <password>public02</password>
</span><span class="cx"> <full-name>Public 02</full-name>
</span><span class="cx"> <email>public02@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public03</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000003</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000003</guid>
</span><ins>+ <short-name>public03</short-name>
</ins><span class="cx"> <password>public03</password>
</span><span class="cx"> <full-name>Public 03</full-name>
</span><span class="cx"> <email>public03@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public04</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000004</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000004</guid>
</span><ins>+ <short-name>public04</short-name>
</ins><span class="cx"> <password>public04</password>
</span><span class="cx"> <full-name>Public 04</full-name>
</span><span class="cx"> <email>public04@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public05</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000005</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000005</guid>
</span><ins>+ <short-name>public05</short-name>
</ins><span class="cx"> <password>public05</password>
</span><span class="cx"> <full-name>Public 05</full-name>
</span><span class="cx"> <email>public05@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public06</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000006</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000006</guid>
</span><ins>+ <short-name>public06</short-name>
</ins><span class="cx"> <password>public06</password>
</span><span class="cx"> <full-name>Public 06</full-name>
</span><span class="cx"> <email>public06@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public07</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000007</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000007</guid>
</span><ins>+ <short-name>public07</short-name>
</ins><span class="cx"> <password>public07</password>
</span><span class="cx"> <full-name>Public 07</full-name>
</span><span class="cx"> <email>public07@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public08</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000008</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000008</guid>
</span><ins>+ <short-name>public08</short-name>
</ins><span class="cx"> <password>public08</password>
</span><span class="cx"> <full-name>Public 08</full-name>
</span><span class="cx"> <email>public08@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public09</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000009</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000009</guid>
</span><ins>+ <short-name>public09</short-name>
</ins><span class="cx"> <password>public09</password>
</span><span class="cx"> <full-name>Public 09</full-name>
</span><span class="cx"> <email>public09@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>public10</short-name>
</del><span class="cx"> <uid>50000000-0000-0000-0000-000000000010</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000010</guid>
</span><ins>+ <short-name>public10</short-name>
</ins><span class="cx"> <password>public10</password>
</span><span class="cx"> <full-name>Public 10</full-name>
</span><span class="cx"> <email>public10@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group01</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000001</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000001</guid>
</span><ins>+ <short-name>group01</short-name>
</ins><span class="cx"> <full-name>Group 01</full-name>
</span><span class="cx"> <email>group01@example.com</email>
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000001</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group02</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000002</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000002</guid>
</span><ins>+ <short-name>group02</short-name>
</ins><span class="cx"> <full-name>Group 02</full-name>
</span><span class="cx"> <email>group02@example.com</email>
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000006</member-uid>
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000007</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group03</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000003</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000003</guid>
</span><ins>+ <short-name>group03</short-name>
</ins><span class="cx"> <full-name>Group 03</full-name>
</span><span class="cx"> <email>group03@example.com</email>
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000008</member-uid>
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000009</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group04</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000004</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000004</guid>
</span><ins>+ <short-name>group04</short-name>
</ins><span class="cx"> <full-name>Group 04</full-name>
</span><span class="cx"> <email>group04@example.com</email>
</span><span class="cx"> <member-uid>20000000-0000-0000-0000-000000000002</member-uid>
</span><span class="lines">@@ -958,26 +960,26 @@
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000010</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group05</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000005</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000005</guid>
</span><ins>+ <short-name>group05</short-name>
</ins><span class="cx"> <full-name>Group 05</full-name>
</span><span class="cx"> <email>group05@example.com</email>
</span><span class="cx"> <member-uid>20000000-0000-0000-0000-000000000006</member-uid>
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000020</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group06</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000006</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000006</guid>
</span><ins>+ <short-name>group06</short-name>
</ins><span class="cx"> <full-name>Group 06</full-name>
</span><span class="cx"> <email>group06@example.com</email>
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000021</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group07</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000007</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000007</guid>
</span><ins>+ <short-name>group07</short-name>
</ins><span class="cx"> <full-name>Group 07</full-name>
</span><span class="cx"> <email>group07@example.com</email>
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000022</member-uid>
</span><span class="lines">@@ -985,747 +987,654 @@
</span><span class="cx"> <member-uid>10000000-0000-0000-0000-000000000024</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group08</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000008</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000008</guid>
</span><ins>+ <short-name>group08</short-name>
</ins><span class="cx"> <full-name>Group 08</full-name>
</span><span class="cx"> <email>group08@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group09</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000009</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000009</guid>
</span><ins>+ <short-name>group09</short-name>
</ins><span class="cx"> <full-name>Group 09</full-name>
</span><span class="cx"> <email>group09@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group10</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000010</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000010</guid>
</span><ins>+ <short-name>group10</short-name>
</ins><span class="cx"> <full-name>Group 10</full-name>
</span><span class="cx"> <email>group10@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group11</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000011</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000011</guid>
</span><ins>+ <short-name>group11</short-name>
</ins><span class="cx"> <full-name>Group 11</full-name>
</span><span class="cx"> <email>group11@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group12</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000012</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000012</guid>
</span><ins>+ <short-name>group12</short-name>
</ins><span class="cx"> <full-name>Group 12</full-name>
</span><span class="cx"> <email>group12@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group13</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000013</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000013</guid>
</span><ins>+ <short-name>group13</short-name>
</ins><span class="cx"> <full-name>Group 13</full-name>
</span><span class="cx"> <email>group13@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group14</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000014</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000014</guid>
</span><ins>+ <short-name>group14</short-name>
</ins><span class="cx"> <full-name>Group 14</full-name>
</span><span class="cx"> <email>group14@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group15</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000015</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000015</guid>
</span><ins>+ <short-name>group15</short-name>
</ins><span class="cx"> <full-name>Group 15</full-name>
</span><span class="cx"> <email>group15@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group16</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000016</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000016</guid>
</span><ins>+ <short-name>group16</short-name>
</ins><span class="cx"> <full-name>Group 16</full-name>
</span><span class="cx"> <email>group16@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group17</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000017</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000017</guid>
</span><ins>+ <short-name>group17</short-name>
</ins><span class="cx"> <full-name>Group 17</full-name>
</span><span class="cx"> <email>group17@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group18</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000018</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000018</guid>
</span><ins>+ <short-name>group18</short-name>
</ins><span class="cx"> <full-name>Group 18</full-name>
</span><span class="cx"> <email>group18@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group19</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000019</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000019</guid>
</span><ins>+ <short-name>group19</short-name>
</ins><span class="cx"> <full-name>Group 19</full-name>
</span><span class="cx"> <email>group19@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group20</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000020</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000020</guid>
</span><ins>+ <short-name>group20</short-name>
</ins><span class="cx"> <full-name>Group 20</full-name>
</span><span class="cx"> <email>group20@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group21</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000021</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000021</guid>
</span><ins>+ <short-name>group21</short-name>
</ins><span class="cx"> <full-name>Group 21</full-name>
</span><span class="cx"> <email>group21@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group22</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000022</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000022</guid>
</span><ins>+ <short-name>group22</short-name>
</ins><span class="cx"> <full-name>Group 22</full-name>
</span><span class="cx"> <email>group22@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group23</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000023</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000023</guid>
</span><ins>+ <short-name>group23</short-name>
</ins><span class="cx"> <full-name>Group 23</full-name>
</span><span class="cx"> <email>group23@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group24</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000024</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000024</guid>
</span><ins>+ <short-name>group24</short-name>
</ins><span class="cx"> <full-name>Group 24</full-name>
</span><span class="cx"> <email>group24@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group25</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000025</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000025</guid>
</span><ins>+ <short-name>group25</short-name>
</ins><span class="cx"> <full-name>Group 25</full-name>
</span><span class="cx"> <email>group25@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group26</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000026</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000026</guid>
</span><ins>+ <short-name>group26</short-name>
</ins><span class="cx"> <full-name>Group 26</full-name>
</span><span class="cx"> <email>group26@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group27</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000027</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000027</guid>
</span><ins>+ <short-name>group27</short-name>
</ins><span class="cx"> <full-name>Group 27</full-name>
</span><span class="cx"> <email>group27@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group28</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000028</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000028</guid>
</span><ins>+ <short-name>group28</short-name>
</ins><span class="cx"> <full-name>Group 28</full-name>
</span><span class="cx"> <email>group28@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group29</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000029</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000029</guid>
</span><ins>+ <short-name>group29</short-name>
</ins><span class="cx"> <full-name>Group 29</full-name>
</span><span class="cx"> <email>group29@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group30</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000030</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000030</guid>
</span><ins>+ <short-name>group30</short-name>
</ins><span class="cx"> <full-name>Group 30</full-name>
</span><span class="cx"> <email>group30@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group31</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000031</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000031</guid>
</span><ins>+ <short-name>group31</short-name>
</ins><span class="cx"> <full-name>Group 31</full-name>
</span><span class="cx"> <email>group31@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group32</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000032</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000032</guid>
</span><ins>+ <short-name>group32</short-name>
</ins><span class="cx"> <full-name>Group 32</full-name>
</span><span class="cx"> <email>group32@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group33</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000033</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000033</guid>
</span><ins>+ <short-name>group33</short-name>
</ins><span class="cx"> <full-name>Group 33</full-name>
</span><span class="cx"> <email>group33@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group34</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000034</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000034</guid>
</span><ins>+ <short-name>group34</short-name>
</ins><span class="cx"> <full-name>Group 34</full-name>
</span><span class="cx"> <email>group34@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group35</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000035</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000035</guid>
</span><ins>+ <short-name>group35</short-name>
</ins><span class="cx"> <full-name>Group 35</full-name>
</span><span class="cx"> <email>group35@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group36</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000036</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000036</guid>
</span><ins>+ <short-name>group36</short-name>
</ins><span class="cx"> <full-name>Group 36</full-name>
</span><span class="cx"> <email>group36@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group37</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000037</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000037</guid>
</span><ins>+ <short-name>group37</short-name>
</ins><span class="cx"> <full-name>Group 37</full-name>
</span><span class="cx"> <email>group37@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group38</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000038</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000038</guid>
</span><ins>+ <short-name>group38</short-name>
</ins><span class="cx"> <full-name>Group 38</full-name>
</span><span class="cx"> <email>group38@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group39</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000039</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000039</guid>
</span><ins>+ <short-name>group39</short-name>
</ins><span class="cx"> <full-name>Group 39</full-name>
</span><span class="cx"> <email>group39@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group40</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000040</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000040</guid>
</span><ins>+ <short-name>group40</short-name>
</ins><span class="cx"> <full-name>Group 40</full-name>
</span><span class="cx"> <email>group40@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group41</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000041</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000041</guid>
</span><ins>+ <short-name>group41</short-name>
</ins><span class="cx"> <full-name>Group 41</full-name>
</span><span class="cx"> <email>group41@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group42</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000042</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000042</guid>
</span><ins>+ <short-name>group42</short-name>
</ins><span class="cx"> <full-name>Group 42</full-name>
</span><span class="cx"> <email>group42@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group43</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000043</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000043</guid>
</span><ins>+ <short-name>group43</short-name>
</ins><span class="cx"> <full-name>Group 43</full-name>
</span><span class="cx"> <email>group43@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group44</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000044</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000044</guid>
</span><ins>+ <short-name>group44</short-name>
</ins><span class="cx"> <full-name>Group 44</full-name>
</span><span class="cx"> <email>group44@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group45</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000045</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000045</guid>
</span><ins>+ <short-name>group45</short-name>
</ins><span class="cx"> <full-name>Group 45</full-name>
</span><span class="cx"> <email>group45@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group46</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000046</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000046</guid>
</span><ins>+ <short-name>group46</short-name>
</ins><span class="cx"> <full-name>Group 46</full-name>
</span><span class="cx"> <email>group46@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group47</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000047</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000047</guid>
</span><ins>+ <short-name>group47</short-name>
</ins><span class="cx"> <full-name>Group 47</full-name>
</span><span class="cx"> <email>group47@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group48</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000048</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000048</guid>
</span><ins>+ <short-name>group48</short-name>
</ins><span class="cx"> <full-name>Group 48</full-name>
</span><span class="cx"> <email>group48@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group49</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000049</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000049</guid>
</span><ins>+ <short-name>group49</short-name>
</ins><span class="cx"> <full-name>Group 49</full-name>
</span><span class="cx"> <email>group49@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group50</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000050</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000050</guid>
</span><ins>+ <short-name>group50</short-name>
</ins><span class="cx"> <full-name>Group 50</full-name>
</span><span class="cx"> <email>group50@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group51</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000051</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000051</guid>
</span><ins>+ <short-name>group51</short-name>
</ins><span class="cx"> <full-name>Group 51</full-name>
</span><span class="cx"> <email>group51@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group52</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000052</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000052</guid>
</span><ins>+ <short-name>group52</short-name>
</ins><span class="cx"> <full-name>Group 52</full-name>
</span><span class="cx"> <email>group52@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group53</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000053</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000053</guid>
</span><ins>+ <short-name>group53</short-name>
</ins><span class="cx"> <full-name>Group 53</full-name>
</span><span class="cx"> <email>group53@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group54</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000054</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000054</guid>
</span><ins>+ <short-name>group54</short-name>
</ins><span class="cx"> <full-name>Group 54</full-name>
</span><span class="cx"> <email>group54@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group55</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000055</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000055</guid>
</span><ins>+ <short-name>group55</short-name>
</ins><span class="cx"> <full-name>Group 55</full-name>
</span><span class="cx"> <email>group55@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group56</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000056</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000056</guid>
</span><ins>+ <short-name>group56</short-name>
</ins><span class="cx"> <full-name>Group 56</full-name>
</span><span class="cx"> <email>group56@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group57</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000057</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000057</guid>
</span><ins>+ <short-name>group57</short-name>
</ins><span class="cx"> <full-name>Group 57</full-name>
</span><span class="cx"> <email>group57@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group58</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000058</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000058</guid>
</span><ins>+ <short-name>group58</short-name>
</ins><span class="cx"> <full-name>Group 58</full-name>
</span><span class="cx"> <email>group58@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group59</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000059</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000059</guid>
</span><ins>+ <short-name>group59</short-name>
</ins><span class="cx"> <full-name>Group 59</full-name>
</span><span class="cx"> <email>group59@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group60</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000060</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000060</guid>
</span><ins>+ <short-name>group60</short-name>
</ins><span class="cx"> <full-name>Group 60</full-name>
</span><span class="cx"> <email>group60@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group61</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000061</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000061</guid>
</span><ins>+ <short-name>group61</short-name>
</ins><span class="cx"> <full-name>Group 61</full-name>
</span><span class="cx"> <email>group61@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group62</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000062</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000062</guid>
</span><ins>+ <short-name>group62</short-name>
</ins><span class="cx"> <full-name>Group 62</full-name>
</span><span class="cx"> <email>group62@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group63</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000063</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000063</guid>
</span><ins>+ <short-name>group63</short-name>
</ins><span class="cx"> <full-name>Group 63</full-name>
</span><span class="cx"> <email>group63@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group64</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000064</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000064</guid>
</span><ins>+ <short-name>group64</short-name>
</ins><span class="cx"> <full-name>Group 64</full-name>
</span><span class="cx"> <email>group64@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group65</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000065</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000065</guid>
</span><ins>+ <short-name>group65</short-name>
</ins><span class="cx"> <full-name>Group 65</full-name>
</span><span class="cx"> <email>group65@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group66</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000066</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000066</guid>
</span><ins>+ <short-name>group66</short-name>
</ins><span class="cx"> <full-name>Group 66</full-name>
</span><span class="cx"> <email>group66@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group67</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000067</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000067</guid>
</span><ins>+ <short-name>group67</short-name>
</ins><span class="cx"> <full-name>Group 67</full-name>
</span><span class="cx"> <email>group67@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group68</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000068</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000068</guid>
</span><ins>+ <short-name>group68</short-name>
</ins><span class="cx"> <full-name>Group 68</full-name>
</span><span class="cx"> <email>group68@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group69</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000069</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000069</guid>
</span><ins>+ <short-name>group69</short-name>
</ins><span class="cx"> <full-name>Group 69</full-name>
</span><span class="cx"> <email>group69@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group70</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000070</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000070</guid>
</span><ins>+ <short-name>group70</short-name>
</ins><span class="cx"> <full-name>Group 70</full-name>
</span><span class="cx"> <email>group70@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group71</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000071</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000071</guid>
</span><ins>+ <short-name>group71</short-name>
</ins><span class="cx"> <full-name>Group 71</full-name>
</span><span class="cx"> <email>group71@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group72</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000072</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000072</guid>
</span><ins>+ <short-name>group72</short-name>
</ins><span class="cx"> <full-name>Group 72</full-name>
</span><span class="cx"> <email>group72@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group73</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000073</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000073</guid>
</span><ins>+ <short-name>group73</short-name>
</ins><span class="cx"> <full-name>Group 73</full-name>
</span><span class="cx"> <email>group73@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group74</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000074</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000074</guid>
</span><ins>+ <short-name>group74</short-name>
</ins><span class="cx"> <full-name>Group 74</full-name>
</span><span class="cx"> <email>group74@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group75</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000075</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000075</guid>
</span><ins>+ <short-name>group75</short-name>
</ins><span class="cx"> <full-name>Group 75</full-name>
</span><span class="cx"> <email>group75@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group76</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000076</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000076</guid>
</span><ins>+ <short-name>group76</short-name>
</ins><span class="cx"> <full-name>Group 76</full-name>
</span><span class="cx"> <email>group76@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group77</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000077</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000077</guid>
</span><ins>+ <short-name>group77</short-name>
</ins><span class="cx"> <full-name>Group 77</full-name>
</span><span class="cx"> <email>group77@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group78</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000078</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000078</guid>
</span><ins>+ <short-name>group78</short-name>
</ins><span class="cx"> <full-name>Group 78</full-name>
</span><span class="cx"> <email>group78@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group79</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000079</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000079</guid>
</span><ins>+ <short-name>group79</short-name>
</ins><span class="cx"> <full-name>Group 79</full-name>
</span><span class="cx"> <email>group79@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group80</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000080</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000080</guid>
</span><ins>+ <short-name>group80</short-name>
</ins><span class="cx"> <full-name>Group 80</full-name>
</span><span class="cx"> <email>group80@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group81</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000081</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000081</guid>
</span><ins>+ <short-name>group81</short-name>
</ins><span class="cx"> <full-name>Group 81</full-name>
</span><span class="cx"> <email>group81@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group82</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000082</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000082</guid>
</span><ins>+ <short-name>group82</short-name>
</ins><span class="cx"> <full-name>Group 82</full-name>
</span><span class="cx"> <email>group82@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group83</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000083</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000083</guid>
</span><ins>+ <short-name>group83</short-name>
</ins><span class="cx"> <full-name>Group 83</full-name>
</span><span class="cx"> <email>group83@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group84</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000084</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000084</guid>
</span><ins>+ <short-name>group84</short-name>
</ins><span class="cx"> <full-name>Group 84</full-name>
</span><span class="cx"> <email>group84@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group85</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000085</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000085</guid>
</span><ins>+ <short-name>group85</short-name>
</ins><span class="cx"> <full-name>Group 85</full-name>
</span><span class="cx"> <email>group85@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group86</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000086</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000086</guid>
</span><ins>+ <short-name>group86</short-name>
</ins><span class="cx"> <full-name>Group 86</full-name>
</span><span class="cx"> <email>group86@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group87</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000087</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000087</guid>
</span><ins>+ <short-name>group87</short-name>
</ins><span class="cx"> <full-name>Group 87</full-name>
</span><span class="cx"> <email>group87@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group88</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000088</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000088</guid>
</span><ins>+ <short-name>group88</short-name>
</ins><span class="cx"> <full-name>Group 88</full-name>
</span><span class="cx"> <email>group88@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group89</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000089</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000089</guid>
</span><ins>+ <short-name>group89</short-name>
</ins><span class="cx"> <full-name>Group 89</full-name>
</span><span class="cx"> <email>group89@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group90</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000090</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000090</guid>
</span><ins>+ <short-name>group90</short-name>
</ins><span class="cx"> <full-name>Group 90</full-name>
</span><span class="cx"> <email>group90@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group91</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000091</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000091</guid>
</span><ins>+ <short-name>group91</short-name>
</ins><span class="cx"> <full-name>Group 91</full-name>
</span><span class="cx"> <email>group91@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group92</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000092</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000092</guid>
</span><ins>+ <short-name>group92</short-name>
</ins><span class="cx"> <full-name>Group 92</full-name>
</span><span class="cx"> <email>group92@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group93</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000093</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000093</guid>
</span><ins>+ <short-name>group93</short-name>
</ins><span class="cx"> <full-name>Group 93</full-name>
</span><span class="cx"> <email>group93@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group94</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000094</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000094</guid>
</span><ins>+ <short-name>group94</short-name>
</ins><span class="cx"> <full-name>Group 94</full-name>
</span><span class="cx"> <email>group94@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group95</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000095</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000095</guid>
</span><ins>+ <short-name>group95</short-name>
</ins><span class="cx"> <full-name>Group 95</full-name>
</span><span class="cx"> <email>group95@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group96</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000096</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000096</guid>
</span><ins>+ <short-name>group96</short-name>
</ins><span class="cx"> <full-name>Group 96</full-name>
</span><span class="cx"> <email>group96@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group97</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000097</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000097</guid>
</span><ins>+ <short-name>group97</short-name>
</ins><span class="cx"> <full-name>Group 97</full-name>
</span><span class="cx"> <email>group97@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group98</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000098</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000098</guid>
</span><ins>+ <short-name>group98</short-name>
</ins><span class="cx"> <full-name>Group 98</full-name>
</span><span class="cx"> <email>group98@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group99</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000099</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000099</guid>
</span><ins>+ <short-name>group99</short-name>
</ins><span class="cx"> <full-name>Group 99</full-name>
</span><span class="cx"> <email>group99@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>group100</short-name>
</del><span class="cx"> <uid>20000000-0000-0000-0000-000000000100</uid>
</span><span class="cx"> <guid>20000000-0000-0000-0000-000000000100</guid>
</span><ins>+ <short-name>group100</short-name>
</ins><span class="cx"> <full-name>Group 100</full-name>
</span><span class="cx"> <email>group100@example.com</email>
</span><del>-
</del><span class="cx"> </record>
</span><span class="cx"> </directory>
</span></span></pre></div>
<a id="CalendarServertrunkconfauthaccountsdtd"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/accounts.dtd (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/accounts.dtd 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/accounts.dtd 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -14,30 +14,23 @@
</span><span class="cx"> limitations under the License.
</span><span class="cx"> -->
</span><span class="cx">
</span><del>-<!ELEMENT accounts (user*, group*, resource*, location*) >
- <!ATTLIST accounts realm CDATA "">
</del><ins>+<!ELEMENT directory (record*) >
+ <!ATTLIST directory realm CDATA "">
</ins><span class="cx">
</span><del>- <!ELEMENT user (uid*, guid, password?, name?, first-name?, last-name?, email-address*)>
- <!ATTLIST user repeat CDATA "1">
</del><ins>+ <!ELEMENT record (uid, guid?, short-name*, password?, full-name*, email*, member-uid*,
+ capacity?, floor?, associated-address?, abbreviated-name?, street-address?, geographic-location?)>
+ <!ATTLIST record type (user|group|location|resource|address) "user">
</ins><span class="cx">
</span><del>- <!ELEMENT group (uid*, guid, password?, name?, members)>
- <!ATTLIST group repeat CDATA "1">
-
- <!ELEMENT resource (uid*, guid, password?, name?,)>
- <!ATTLIST resource repeat CDATA "1">
-
- <!ELEMENT location (uid*, guid, password?, name?,)>
- <!ATTLIST location repeat CDATA "1">
-
- <!ELEMENT member (#PCDATA)>
- <!ATTLIST member type (users|groups|locations|resources) "users">
-
- <!ELEMENT uid (#PCDATA)>
- <!ELEMENT guid (#PCDATA)>
- <!ELEMENT password (#PCDATA)>
- <!ELEMENT name (#PCDATA)>
- <!ELEMENT first-name (#PCDATA)>
- <!ELEMENT last-name (#PCDATA)>
- <!ELEMENT email-address (#PCDATA)>
- <!ELEMENT members (member*)>
->
</del><ins>+ <!ELEMENT uid (#PCDATA)>
+ <!ELEMENT guid (#PCDATA)>
+ <!ELEMENT password (#PCDATA)>
+ <!ELEMENT short-name (#PCDATA)>
+ <!ELEMENT full-name (#PCDATA)>
+ <!ELEMENT email (#PCDATA)>
+ <!ELEMENT member-uid (#PCDATA)>
+ <!ELEMENT capacity (#PCDATA)>
+ <!ELEMENT floor (#PCDATA)>
+ <!ELEMENT associated-address (#PCDATA)>
+ <!ELEMENT abbreviated-name (#PCDATA)>
+ <!ELEMENT street-address (#PCDATA)>
+ <!ELEMENT geographic-location (#PCDATA)>
</ins></span></pre></div>
<a id="CalendarServertrunkconfauthaccountsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/accounts.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/accounts.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/accounts.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -18,29 +18,21 @@
</span><span class="cx">
</span><span class="cx"> <!DOCTYPE accounts SYSTEM "accounts.dtd">
</span><span class="cx">
</span><del>-<accounts realm="Test Realm">
- <user>
- <uid>admin</uid>
</del><ins>+<directory realm="Test Realm">
+<record>
+ <uid>0C8BDE62-E600-4696-83D3-8B5ECABDFD2E</uid>
+ <guid>0C8BDE62-E600-4696-83D3-8B5ECABDFD2E</guid>
+ <short-name>admin</short-name>
</ins><span class="cx"> <password>admin</password>
</span><del>- <name>Super User</name>
- </user>
- <user>
- <uid>test</uid>
</del><ins>+ <full-name>Super User</full-name>
+ <email>admin@example.com</email>
+</record>
+<record>
+ <uid>29B6C503-11DF-43EC-8CCA-40C7003149CE</uid>
+ <guid>29B6C503-11DF-43EC-8CCA-40C7003149CE</guid>
+ <short-name>test</short-name>
</ins><span class="cx"> <password>test</password>
</span><del>- <name>Test User</name>
- </user>
- <group>
- <uid>users</uid>
- <password>users</password>
- <name>Users Group</name>
- <members>
- <member type="users">test</member>
- </members>
- </group>
- <location>
- <uid>mercury</uid>
- <password>mercury</password>
- <name>Mecury Conference Room, Building 1, 2nd Floor</name>
- </location>
-</accounts>
-
</del><ins>+ <full-name>Test User</full-name>
+ <email>test@example.com</email>
+</record>
+</directory>
</ins></span></pre></div>
<a id="CalendarServertrunkconfauthaugmentsdefaultxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/augments-default.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/augments-default.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/augments-default.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -1,27 +1,8 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-
-<!--
-Copyright (c) 2009-2014 Apple Inc. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
- -->
-
</del><span class="cx"> <!DOCTYPE augments SYSTEM "augments.dtd">
</span><del>-
</del><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></pre></div>
<a id="CalendarServertrunkconfauthaugmentstestpodxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/augments-test-pod.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/augments-test-pod.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/augments-test-pod.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -1,19 +1,628 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><ins>+
+<!--
+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
</ins><span class="cx"> <!DOCTYPE augments SYSTEM "augments.dtd">
</span><span class="cx">
</span><span class="cx"> <augments>
</span><del>- <record>
</del><ins>+<record>
</ins><span class="cx"> <uid>Default</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <server-id>A</server-id>
</span><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><del>- </record>
- <record repeat="101">
- <uid>puser%02d</uid>
- <enable>true</enable>
</del><ins>+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000001</uid>
</ins><span class="cx"> <server-id>B</server-id>
</span><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><del>- </record>
</del><ins>+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000002</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000003</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000004</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000005</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000006</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000007</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000008</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000009</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000010</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000011</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000012</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000013</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000014</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000015</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000016</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000017</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000018</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000019</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000020</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000021</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000022</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000023</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000024</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000025</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000026</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000027</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000028</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000029</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000030</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000031</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000032</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000033</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000034</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000035</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000036</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000037</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000038</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000039</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000040</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000041</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000042</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000043</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000044</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000045</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000046</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000047</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000048</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000049</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000050</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000051</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000052</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000053</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000054</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000055</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000056</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000057</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000058</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000059</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000060</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000061</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000062</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000063</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000064</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000065</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000066</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000067</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000068</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000069</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000070</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000071</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000072</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000073</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000074</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000075</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000076</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000077</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000078</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000079</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000080</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000081</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000082</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000083</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000084</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000085</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000086</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000087</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000088</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000089</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000090</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000091</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000092</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000093</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000094</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000095</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000096</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000097</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000098</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000099</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+<record>
+ <uid>60000000-0000-0000-0000-000000000100</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
</ins><span class="cx"> </augments>
</span></span></pre></div>
<a id="CalendarServertrunkconfauthaugmentstests2sxml"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/auth/augments-test-s2s.xml (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/augments-test-s2s.xml (rev 0)
+++ CalendarServer/trunk/conf/auth/augments-test-s2s.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<!DOCTYPE augments SYSTEM "augments.dtd">
+
+<augments>
+<record>
+ <uid>Default</uid>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+</augments>
</ins></span></pre></div>
<a id="CalendarServertrunkconfauthaugmentstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/augments-test.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/augments-test.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/augments-test.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -16,6 +16,8 @@
</span><span class="cx"> limitations under the License.
</span><span class="cx"> -->
</span><span class="cx">
</span><ins>+<!DOCTYPE augments SYSTEM "augments.dtd">
+
</ins><span class="cx"> <augments>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>Default</uid>
</span><span class="lines">@@ -36,45 +38,45 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>40000000-0000-0000-0000-000000000005</uid>
</span><ins>+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
</ins><span class="cx"> <auto-schedule-mode>none</auto-schedule-mode>
</span><del>- <enable-addressbook>true</enable-addressbook>
- <enable-calendar>true</enable-calendar>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>40000000-0000-0000-0000-000000000006</uid>
</span><ins>+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
</ins><span class="cx"> <auto-schedule-mode>accept-always</auto-schedule-mode>
</span><del>- <enable-addressbook>true</enable-addressbook>
- <enable-calendar>true</enable-calendar>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>40000000-0000-0000-0000-000000000007</uid>
</span><ins>+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
</ins><span class="cx"> <auto-schedule-mode>decline-always</auto-schedule-mode>
</span><del>- <enable-addressbook>true</enable-addressbook>
- <enable-calendar>true</enable-calendar>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>40000000-0000-0000-0000-000000000008</uid>
</span><ins>+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
</ins><span class="cx"> <auto-schedule-mode>accept-if-free</auto-schedule-mode>
</span><del>- <enable-addressbook>true</enable-addressbook>
- <enable-calendar>true</enable-calendar>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>40000000-0000-0000-0000-000000000009</uid>
</span><ins>+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
</ins><span class="cx"> <auto-schedule-mode>decline-if-busy</auto-schedule-mode>
</span><del>- <enable-addressbook>true</enable-addressbook>
- <enable-calendar>true</enable-calendar>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>40000000-0000-0000-0000-000000000010</uid>
</span><ins>+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
</ins><span class="cx"> <auto-schedule-mode>automatic</auto-schedule-mode>
</span><del>- <enable-addressbook>true</enable-addressbook>
- <enable-calendar>true</enable-calendar>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>40000000-0000-0000-0000-000000000011</uid>
</span><ins>+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
</ins><span class="cx"> <auto-schedule-mode>decline-always</auto-schedule-mode>
</span><del>- <enable-addressbook>true</enable-addressbook>
- <enable-calendar>true</enable-calendar>
</del><span class="cx"> <auto-accept-group>20000000-0000-0000-0000-000000000001</auto-accept-group>
</span><span class="cx"> </record>
</span><span class="cx"> </augments>
</span></span></pre></div>
<a id="CalendarServertrunkconfauthaugmentsdtd"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/augments.dtd (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/augments.dtd 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/augments.dtd 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -18,24 +18,18 @@
</span><span class="cx">
</span><span class="cx"> <!ELEMENT record (
</span><span class="cx"> uid,
</span><del>- enable,
</del><span class="cx"> server-id?,
</span><span class="cx"> enable-calendar?,
</span><span class="cx"> enable-addressbook?,
</span><span class="cx"> enable-login?,
</span><del>- auto-schedule?,
</del><span class="cx"> auto-schedule-mode?,
</span><span class="cx"> auto-accept-group?
</span><span class="cx"> )>
</span><del>- <!ATTLIST record repeat CDATA "1">
</del><span class="cx">
</span><span class="cx"> <!ELEMENT uid (#PCDATA)>
</span><del>- <!ELEMENT enable (#PCDATA)>
</del><span class="cx"> <!ELEMENT server-id (#PCDATA)>
</span><span class="cx"> <!ELEMENT enable-calendar (#PCDATA)>
</span><span class="cx"> <!ELEMENT enable-addressbook (#PCDATA)>
</span><span class="cx"> <!ELEMENT enable-login (#PCDATA)>
</span><del>- <!ELEMENT auto-schedule (#PCDATA)>
</del><span class="cx"> <!ELEMENT auto-schedule-mode (#PCDATA)>
</span><span class="cx"> <!ELEMENT auto-accept-group (#PCDATA)>
</span><del>->
</del></span></pre></div>
<a id="CalendarServertrunkconfauthgenerate_test_accountspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/generate_test_accounts.py (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/generate_test_accounts.py 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/generate_test_accounts.py 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -31,11 +31,14 @@
</span><span class="cx"> LOCATIONGUIDS = "30000000-0000-0000-0000-000000000%03d"
</span><span class="cx"> RESOURCEGUIDS = "40000000-0000-0000-0000-000000000%03d"
</span><span class="cx"> PUBLICGUIDS = "50000000-0000-0000-0000-0000000000%02d"
</span><ins>+PUSERGUIDS = "60000000-0000-0000-0000-000000000%03d"
+S2SUSERGUIDS = "70000000-0000-0000-0000-000000000%03d"
</ins><span class="cx">
</span><span class="cx"> # accounts-test.xml
</span><span class="cx">
</span><span class="cx"> out = file("accounts-test.xml", "w")
</span><span class="cx"> out.write(prefix)
</span><ins>+out.write('<!DOCTYPE accounts SYSTEM "accounts.dtd">\n\n')
</ins><span class="cx"> out.write('<directory realm="Test Realm">\n')
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -57,26 +60,26 @@
</span><span class="cx"> # user01-100
</span><span class="cx"> for i in xrange(1, 101):
</span><span class="cx"> out.write("""<record type="user">
</span><del>- <short-name>user%02d</short-name>
- <uid>%s</uid>
- <guid>%s</guid>
- <password>user%02d</password>
- <full-name>User %02d</full-name>
- <email>user%02d@example.com</email>
</del><ins>+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>user{ctr:02d}</short-name>
+ <password>user{ctr:02d}</password>
+ <full-name>User {ctr:02d}</full-name>
+ <email>user{ctr:02d}@example.com</email>
</ins><span class="cx"> </record>
</span><del>-""" % (i, USERGUIDS % i, USERGUIDS % i, i, i, i))
</del><ins>+""".format(guid=(USERGUIDS % i), ctr=i))
</ins><span class="cx">
</span><span class="cx"> # public01-10
</span><span class="cx"> for i in xrange(1, 11):
</span><span class="cx"> out.write("""<record type="user">
</span><del>- <short-name>public%02d</short-name>
- <uid>%s</uid>
- <guid>%s</guid>
- <password>public%02d</password>
- <full-name>Public %02d</full-name>
- <email>public%02d@example.com</email>
</del><ins>+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>public{ctr:02d}</short-name>
+ <password>public{ctr:02d}</password>
+ <full-name>Public {ctr:02d}</full-name>
+ <email>public{ctr:02d}@example.com</email>
</ins><span class="cx"> </record>
</span><del>-""" % (i, PUBLICGUIDS % i, PUBLICGUIDS % i, i, i, i))
</del><ins>+""".format(guid=PUBLICGUIDS % i, ctr=i))
</ins><span class="cx">
</span><span class="cx"> # group01-100
</span><span class="cx"> members = {
</span><span class="lines">@@ -96,138 +99,240 @@
</span><span class="cx"> if groupUID in members:
</span><span class="cx"> for uid in members[groupUID]:
</span><span class="cx"> memberElements.append("<member-uid>{}</member-uid>".format(uid))
</span><del>- memberString = "\n ".join(memberElements)
</del><ins>+ memberString = " " + "\n ".join(memberElements) + "\n"
</ins><span class="cx"> else:
</span><span class="cx"> memberString = ""
</span><span class="cx">
</span><span class="cx"> out.write("""<record type="group">
</span><del>- <short-name>group%02d</short-name>
- <uid>%s</uid>
- <guid>%s</guid>
- <full-name>Group %02d</full-name>
- <email>group%02d@example.com</email>
- %s
</del><ins>+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>group{ctr:02d}</short-name>
+ <full-name>Group {ctr:02d}</full-name>
+ <email>group{ctr:02d}@example.com</email>
+{members}</record>
+""".format(guid=GROUPGUIDS % i, ctr=i, members=memberString))
+
+out.write("</directory>\n")
+out.close()
+
+
+# accounts-test-pod.xml
+
+out = file("accounts-test-pod.xml", "w")
+out.write(prefix)
+out.write('<!DOCTYPE accounts SYSTEM "accounts.dtd">\n\n')
+out.write('<directory realm="Test Realm">\n')
+
+
+for uid, fullName, guid in (
+ ("admin", "Super User", "0C8BDE62-E600-4696-83D3-8B5ECABDFD2E"),
+):
+ out.write("""<record>
+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>{uid}</short-name>
+ <password>{uid}</password>
+ <full-name>{fullName}</full-name>
+ <email>{uid}@example.com</email>
</ins><span class="cx"> </record>
</span><del>-""" % (i, GROUPGUIDS % i, GROUPGUIDS % i, i, i, memberString))
</del><ins>+""".format(uid=uid, guid=guid, fullName=fullName))
</ins><span class="cx">
</span><ins>+# user01-100
+for i in xrange(1, 101):
+ out.write("""<record type="user">
+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>user{ctr:02d}</short-name>
+ <password>user{ctr:02d}</password>
+ <full-name>User {ctr:02d}</full-name>
+ <email>user{ctr:02d}@example.com</email>
+</record>
+""".format(guid=USERGUIDS % i, ctr=i))
+
+# puser01-100
+for i in xrange(1, 101):
+ out.write("""<record type="user">
+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>puser{ctr:02d}</short-name>
+ <password>puser{ctr:02d}</password>
+ <full-name>Puser {ctr:02d}</full-name>
+ <email>puser{ctr:02d}@example.com</email>
+</record>
+""".format(guid=PUSERGUIDS % i, ctr=i))
+
</ins><span class="cx"> out.write("</directory>\n")
</span><span class="cx"> out.close()
</span><span class="cx">
</span><span class="cx">
</span><ins>+# accounts-test-s2s.xml
+
+out = file("accounts-test-s2s.xml", "w")
+out.write(prefix)
+out.write('<!DOCTYPE accounts SYSTEM "accounts.dtd">\n\n')
+out.write('<directory realm="Test Realm 2">\n')
+
+
+for uid, fullName, guid in (
+ ("admin", "Super User", "82A5A2FA-F8FD-4761-B1CB-F1664C1F376A"),
+):
+ out.write("""<record>
+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>{uid}</short-name>
+ <password>{uid}</password>
+ <full-name>{fullName}</full-name>
+ <email>{uid}@example.org</email>
+</record>
+""".format(uid=uid, guid=guid, fullName=fullName))
+
+# other01-100
+for i in xrange(1, 101):
+ out.write("""<record type="user">
+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>other{ctr:02d}</short-name>
+ <password>other{ctr:02d}</password>
+ <full-name>Other {ctr:02d}</full-name>
+ <email>other{ctr:02d}@example.org</email>
+</record>
+""".format(guid=S2SUSERGUIDS % i, ctr=i))
+
+out.write("</directory>\n")
+out.close()
+
+
</ins><span class="cx"> # resources-test.xml
</span><span class="cx">
</span><span class="cx"> out = file("resources-test.xml", "w")
</span><span class="cx"> out.write(prefix)
</span><ins>+out.write('<!DOCTYPE accounts SYSTEM "accounts.dtd">\n\n')
</ins><span class="cx"> out.write('<directory realm="Test Realm">\n')
</span><span class="cx">
</span><del>-out.write("""
- <record type="location">
- <short-name>pretend</short-name>
- <uid>pretend</uid>
- <full-name>Pretend Conference Room</full-name>
- <associated-address>il1</associated-address>
- </record>
- <record type="address">
- <short-name>il1</short-name>
- <uid>il1</uid>
- <full-name>IL1</full-name>
- <street-address>1 Infinite Loop, Cupertino, CA 95014</street-address>
- <geographic-location>37.331741,-122.030333</geographic-location>
- </record>
- <record type="location">
- <short-name>fantastic</short-name>
- <uid>fantastic</uid>
- <full-name>Fantastic Conference Room</full-name>
- <associated-address>il2</associated-address>
- </record>
- <record type="address">
- <short-name>il2</short-name>
- <uid>il2</uid>
- <full-name>IL2</full-name>
- <street-address>2 Infinite Loop, Cupertino, CA 95014</street-address>
- <geographic-location>37.332633,-122.030502</geographic-location>
- </record>
- <record type="location">
- <short-name>delegatedroom</short-name>
- <uid>delegatedroom</uid>
- <full-name>Delegated Conference Room</full-name>
- </record>
-
</del><ins>+out.write("""<record type="location">
+ <uid>pretend</uid>
+ <short-name>pretend</short-name>
+ <full-name>Pretend Conference Room</full-name>
+ <associated-address>il1</associated-address>
+</record>
+<record type="address">
+ <uid>il1</uid>
+ <short-name>il1</short-name>
+ <full-name>IL1</full-name>
+ <street-address>1 Infinite Loop, Cupertino, CA 95014</street-address>
+ <geographic-location>37.331741,-122.030333</geographic-location>
+</record>
+<record type="location">
+ <uid>fantastic</uid>
+ <short-name>fantastic</short-name>
+ <full-name>Fantastic Conference Room</full-name>
+ <associated-address>il2</associated-address>
+</record>
+<record type="address">
+ <uid>il2</uid>
+ <short-name>il2</short-name>
+ <full-name>IL2</full-name>
+ <street-address>2 Infinite Loop, Cupertino, CA 95014</street-address>
+ <geographic-location>37.332633,-122.030502</geographic-location>
+</record>
+<record type="location">
+ <uid>delegatedroom</uid>
+ <short-name>delegatedroom</short-name>
+ <full-name>Delegated Conference Room</full-name>
+</record>
</ins><span class="cx"> """)
</span><span class="cx">
</span><span class="cx"> for i in xrange(1, 101):
</span><span class="cx"> out.write("""<record type="location">
</span><del>- <short-name>location%02d</short-name>
- <uid>%s</uid>
- <guid>%s</guid>
- <full-name>Location %02d</full-name>
</del><ins>+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>location{ctr:02d}</short-name>
+ <full-name>Location {ctr:02d}</full-name>
</ins><span class="cx"> </record>
</span><del>-""" % (i, LOCATIONGUIDS % i, LOCATIONGUIDS % i, i))
</del><ins>+""".format(guid=LOCATIONGUIDS % i, ctr=i))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> for i in xrange(1, 101):
</span><span class="cx"> out.write("""<record type="resource">
</span><del>- <short-name>resource%02d</short-name>
- <uid>%s</uid>
- <guid>%s</guid>
- <full-name>Resource %02d</full-name>
</del><ins>+ <uid>{guid}</uid>
+ <guid>{guid}</guid>
+ <short-name>resource{ctr:02d}</short-name>
+ <full-name>Resource {ctr:02d}</full-name>
</ins><span class="cx"> </record>
</span><del>-""" % (i, RESOURCEGUIDS % i, RESOURCEGUIDS % i, i))
</del><ins>+""".format(guid=RESOURCEGUIDS % i, ctr=i))
</ins><span class="cx">
</span><span class="cx"> out.write("</directory>\n")
</span><span class="cx"> out.close()
</span><span class="cx">
</span><span class="cx">
</span><ins>+# resources-test-pod.xml
+
+out = file("resources-test-pod.xml", "w")
+out.write(prefix)
+out.write('<!DOCTYPE accounts SYSTEM "accounts.dtd">\n\n')
+out.write('<directory realm="Test Realm" />\n')
+out.close()
+
+# resources-test-s2s.xml
+
+out = file("resources-test-s2s.xml", "w")
+out.write(prefix)
+out.write('<!DOCTYPE accounts SYSTEM "accounts.dtd">\n\n')
+out.write('<directory realm="Test Realm 2" />\n')
+out.close()
+
+
</ins><span class="cx"> # augments-test.xml
</span><span class="cx">
</span><span class="cx"> out = file("augments-test.xml", "w")
</span><span class="cx"> out.write(prefix)
</span><ins>+out.write('<!DOCTYPE augments SYSTEM "augments.dtd">\n\n')
</ins><span class="cx"> out.write("<augments>\n")
</span><span class="cx">
</span><span class="cx"> augments = (
</span><span class="cx"> # resource05
</span><del>- (RESOURCEGUIDS % 5, {
- "auto-schedule-mode": "none",
- "enable-calendar": "true",
- "enable-addressbook": "true",
- }),
</del><ins>+ (RESOURCEGUIDS % 5, (
+ ("enable-calendar", "true"),
+ ("enable-addressbook", "true"),
+ ("auto-schedule-mode", "none"),
+ )),
</ins><span class="cx"> # resource06
</span><del>- (RESOURCEGUIDS % 6, {
- "auto-schedule-mode": "accept-always",
- "enable-calendar": "true",
- "enable-addressbook": "true",
- }),
</del><ins>+ (RESOURCEGUIDS % 6, (
+ ("enable-calendar", "true"),
+ ("enable-addressbook", "true"),
+ ("auto-schedule-mode", "accept-always"),
+ )),
</ins><span class="cx"> # resource07
</span><del>- (RESOURCEGUIDS % 7, {
- "auto-schedule-mode": "decline-always",
- "enable-calendar": "true",
- "enable-addressbook": "true",
- }),
</del><ins>+ (RESOURCEGUIDS % 7, (
+ ("enable-calendar", "true"),
+ ("enable-addressbook", "true"),
+ ("auto-schedule-mode", "decline-always"),
+ )),
</ins><span class="cx"> # resource08
</span><del>- (RESOURCEGUIDS % 8, {
- "auto-schedule-mode": "accept-if-free",
- "enable-calendar": "true",
- "enable-addressbook": "true",
- }),
</del><ins>+ (RESOURCEGUIDS % 8, (
+ ("enable-calendar", "true"),
+ ("enable-addressbook", "true"),
+ ("auto-schedule-mode", "accept-if-free"),
+ )),
</ins><span class="cx"> # resource09
</span><del>- (RESOURCEGUIDS % 9, {
- "auto-schedule-mode": "decline-if-busy",
- "enable-calendar": "true",
- "enable-addressbook": "true",
- }),
</del><ins>+ (RESOURCEGUIDS % 9, (
+ ("enable-calendar", "true"),
+ ("enable-addressbook", "true"),
+ ("auto-schedule-mode", "decline-if-busy"),
+ )),
</ins><span class="cx"> # resource10
</span><del>- (RESOURCEGUIDS % 10, {
- "auto-schedule-mode": "automatic",
- "enable-calendar": "true",
- "enable-addressbook": "true",
- }),
</del><ins>+ (RESOURCEGUIDS % 10, (
+ ("enable-calendar", "true"),
+ ("enable-addressbook", "true"),
+ ("auto-schedule-mode", "automatic"),
+ )),
</ins><span class="cx"> # resource11
</span><del>- (RESOURCEGUIDS % 11, {
- "auto-schedule-mode": "decline-always",
- "auto-accept-group": GROUPGUIDS % 1,
- "enable-calendar": "true",
- "enable-addressbook": "true",
- }),
</del><ins>+ (RESOURCEGUIDS % 11, (
+ ("enable-calendar", "true"),
+ ("enable-addressbook", "true"),
+ ("auto-schedule-mode", "decline-always"),
+ ("auto-accept-group", GROUPGUIDS % 1),
+ )),
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> out.write("""<record>
</span><span class="lines">@@ -255,7 +360,7 @@
</span><span class="cx">
</span><span class="cx"> for uid, settings in augments:
</span><span class="cx"> elements = []
</span><del>- for key, value in settings.iteritems():
</del><ins>+ for key, value in settings:
</ins><span class="cx"> elements.append("<{key}>{value}</{key}>".format(key=key, value=value))
</span><span class="cx"> elementsString = "\n ".join(elements)
</span><span class="cx">
</span><span class="lines">@@ -269,56 +374,104 @@
</span><span class="cx"> out.close()
</span><span class="cx">
</span><span class="cx">
</span><ins>+# augments-test-pod.xml
+
+out = file("augments-test-pod.xml", "w")
+out.write(prefix)
+out.write('<!DOCTYPE augments SYSTEM "augments.dtd">\n\n')
+out.write("<augments>\n")
+
+out.write("""<record>
+ <uid>Default</uid>
+ <server-id>A</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+""")
+
+# puser01-100
+for i in xrange(1, 101):
+ out.write("""<record>
+ <uid>{guid}</uid>
+ <server-id>B</server-id>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+""".format(guid=PUSERGUIDS % i))
+
+out.write("</augments>\n")
+out.close()
+
+
+# augments-test-s2s.xml
+
+out = file("augments-test-s2s.xml", "w")
+out.write(prefix)
+out.write('<!DOCTYPE augments SYSTEM "augments.dtd">\n\n')
+out.write("<augments>\n")
+
+out.write("""<record>
+ <uid>Default</uid>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+</record>
+""")
+
+out.write("</augments>\n")
+out.close()
+
+
</ins><span class="cx"> # proxies-test.xml
</span><span class="cx">
</span><span class="cx"> out = file("proxies-test.xml", "w")
</span><span class="cx"> out.write(prefix)
</span><ins>+out.write('<!DOCTYPE proxies SYSTEM "proxies.dtd">\n\n')
</ins><span class="cx"> out.write("<proxies>\n")
</span><span class="cx">
</span><span class="cx"> proxies = (
</span><span class="cx"> (RESOURCEGUIDS % 1, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> (RESOURCEGUIDS % 2, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> (RESOURCEGUIDS % 3, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> (RESOURCEGUIDS % 4, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> (RESOURCEGUIDS % 5, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> (RESOURCEGUIDS % 6, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> (RESOURCEGUIDS % 7, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> (RESOURCEGUIDS % 8, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> (RESOURCEGUIDS % 9, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> (RESOURCEGUIDS % 10, {
</span><del>- "proxies": (USERGUIDS % 1,),
- "read-only-proxies": (USERGUIDS % 3,),
</del><ins>+ "write-proxies": (USERGUIDS % 1,),
+ "read-proxies": (USERGUIDS % 3,),
</ins><span class="cx"> }),
</span><span class="cx"> ("delegatedroom", {
</span><del>- "proxies": (GROUPGUIDS % 5,),
- "read-only-proxies": (),
</del><ins>+ "write-proxies": (GROUPGUIDS % 5,),
+ "read-proxies": (),
</ins><span class="cx"> }),
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -339,3 +492,21 @@
</span><span class="cx">
</span><span class="cx"> out.write("</proxies>\n")
</span><span class="cx"> out.close()
</span><ins>+
+
+# proxies-test-pod.xml
+
+out = file("proxies-test-pod.xml", "w")
+out.write(prefix)
+out.write('<!DOCTYPE proxies SYSTEM "proxies.dtd">\n\n')
+out.write("<proxies />\n")
+out.close()
+
+
+# proxies-test-s2s.xml
+
+out = file("proxies-test-s2s.xml", "w")
+out.write(prefix)
+out.write('<!DOCTYPE proxies SYSTEM "proxies.dtd">\n\n')
+out.write("<proxies />\n")
+out.close()
</ins></span></pre></div>
<a id="CalendarServertrunkconfauthproxiestestpodxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/proxies-test-pod.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/proxies-test-pod.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/proxies-test-pod.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx">
</span><span class="cx"> <!--
</span><del>-Copyright (c) 2009-2014 Apple Inc. All rights reserved.
</del><ins>+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> you may not use this file except in compliance with the License.
</span><span class="lines">@@ -18,5 +18,4 @@
</span><span class="cx">
</span><span class="cx"> <!DOCTYPE proxies SYSTEM "proxies.dtd">
</span><span class="cx">
</span><del>-<proxies>
-</proxies>
</del><ins>+<proxies />
</ins></span></pre></div>
<a id="CalendarServertrunkconfauthproxiestests2sxml"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/auth/proxies-test-s2s.xml (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/proxies-test-s2s.xml (rev 0)
+++ CalendarServer/trunk/conf/auth/proxies-test-s2s.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<!DOCTYPE proxies SYSTEM "proxies.dtd">
+
+<proxies />
</ins></span></pre></div>
<a id="CalendarServertrunkconfauthproxiestestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/proxies-test.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/proxies-test.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/proxies-test.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -16,103 +16,105 @@
</span><span class="cx"> limitations under the License.
</span><span class="cx"> -->
</span><span class="cx">
</span><ins>+<!DOCTYPE proxies SYSTEM "proxies.dtd">
+
</ins><span class="cx"> <proxies>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000001</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000002</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000003</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000004</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000005</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000006</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000007</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000008</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000009</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000010</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000001</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>10000000-0000-0000-0000-000000000003</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>delegatedroom</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>20000000-0000-0000-0000-000000000005</member>
</span><del>- </proxies>
- <read-only-proxies>
- </read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> </proxies>
</span></span></pre></div>
<a id="CalendarServertrunkconfauthproxiesdtd"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/proxies.dtd (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/proxies.dtd 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/proxies.dtd 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -16,11 +16,9 @@
</span><span class="cx">
</span><span class="cx"> <!ELEMENT proxies (record*) >
</span><span class="cx">
</span><del>- <!ELEMENT record (guid, proxies?, read-only-proxies?)>
- <!ATTLIST record repeat CDATA "1">
</del><ins>+ <!ELEMENT record (guid, write-proxies?, read-proxies?)>
</ins><span class="cx">
</span><del>- <!ELEMENT guid (#PCDATA)>
- <!ELEMENT proxies (member*)>
- <!ELEMENT read-only-proxies (member*)>
- <!ELEMENT member (#PCDATA)>
->
</del><ins>+ <!ELEMENT guid (#PCDATA)>
+ <!ELEMENT write-proxies (member*)>
+ <!ELEMENT read-proxies (member*)>
+ <!ELEMENT member (#PCDATA)>
</ins></span></pre></div>
<a id="CalendarServertrunkconfauthresourcestestpodxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/resources-test-pod.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/resources-test-pod.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/resources-test-pod.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -1,4 +1,21 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx">
</span><del>-<accounts realm="Test Realm">
-</accounts>
</del><ins>+<!--
+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
+<directory realm="Test Realm" />
</ins></span></pre></div>
<a id="CalendarServertrunkconfauthresourcestests2sxml"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/auth/resources-test-s2s.xml (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/resources-test-s2s.xml (rev 0)
+++ CalendarServer/trunk/conf/auth/resources-test-s2s.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
+<directory realm="Test Realm 2" />
</ins><span class="cx">Property changes on: CalendarServer/trunk/conf/auth/resources-test-s2s.xml
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="CalendarServertrunkconfauthresourcestestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/resources-test.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/resources-test.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/auth/resources-test.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -16,1238 +16,1238 @@
</span><span class="cx"> limitations under the License.
</span><span class="cx"> -->
</span><span class="cx">
</span><ins>+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
</ins><span class="cx"> <directory realm="Test Realm">
</span><del>-
- <record type="location">
- <short-name>pretend</short-name>
- <uid>pretend</uid>
- <full-name>Pretend Conference Room</full-name>
- <associated-address>il1</associated-address>
- </record>
- <record type="address">
- <short-name>il1</short-name>
- <uid>il1</uid>
- <full-name>IL1</full-name>
- <street-address>1 Infinite Loop, Cupertino, CA 95014</street-address>
- <geographic-location>37.331741,-122.030333</geographic-location>
- </record>
- <record type="location">
- <short-name>fantastic</short-name>
- <uid>fantastic</uid>
- <full-name>Fantastic Conference Room</full-name>
- <associated-address>il2</associated-address>
- </record>
- <record type="address">
- <short-name>il2</short-name>
- <uid>il2</uid>
- <full-name>IL2</full-name>
- <street-address>2 Infinite Loop, Cupertino, CA 95014</street-address>
- <geographic-location>37.332633,-122.030502</geographic-location>
- </record>
- <record type="location">
- <short-name>delegatedroom</short-name>
- <uid>delegatedroom</uid>
- <full-name>Delegated Conference Room</full-name>
- </record>
-
</del><span class="cx"> <record type="location">
</span><del>- <short-name>location01</short-name>
</del><ins>+ <uid>pretend</uid>
+ <short-name>pretend</short-name>
+ <full-name>Pretend Conference Room</full-name>
+ <associated-address>il1</associated-address>
+</record>
+<record type="address">
+ <uid>il1</uid>
+ <short-name>il1</short-name>
+ <full-name>IL1</full-name>
+ <street-address>1 Infinite Loop, Cupertino, CA 95014</street-address>
+ <geographic-location>37.331741,-122.030333</geographic-location>
+</record>
+<record type="location">
+ <uid>fantastic</uid>
+ <short-name>fantastic</short-name>
+ <full-name>Fantastic Conference Room</full-name>
+ <associated-address>il2</associated-address>
+</record>
+<record type="address">
+ <uid>il2</uid>
+ <short-name>il2</short-name>
+ <full-name>IL2</full-name>
+ <street-address>2 Infinite Loop, Cupertino, CA 95014</street-address>
+ <geographic-location>37.332633,-122.030502</geographic-location>
+</record>
+<record type="location">
+ <uid>delegatedroom</uid>
+ <short-name>delegatedroom</short-name>
+ <full-name>Delegated Conference Room</full-name>
+</record>
+<record type="location">
</ins><span class="cx"> <uid>30000000-0000-0000-0000-000000000001</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000001</guid>
</span><ins>+ <short-name>location01</short-name>
</ins><span class="cx"> <full-name>Location 01</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location02</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000002</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000002</guid>
</span><ins>+ <short-name>location02</short-name>
</ins><span class="cx"> <full-name>Location 02</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location03</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000003</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000003</guid>
</span><ins>+ <short-name>location03</short-name>
</ins><span class="cx"> <full-name>Location 03</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location04</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000004</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000004</guid>
</span><ins>+ <short-name>location04</short-name>
</ins><span class="cx"> <full-name>Location 04</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location05</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000005</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000005</guid>
</span><ins>+ <short-name>location05</short-name>
</ins><span class="cx"> <full-name>Location 05</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location06</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000006</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000006</guid>
</span><ins>+ <short-name>location06</short-name>
</ins><span class="cx"> <full-name>Location 06</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location07</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000007</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000007</guid>
</span><ins>+ <short-name>location07</short-name>
</ins><span class="cx"> <full-name>Location 07</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location08</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000008</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000008</guid>
</span><ins>+ <short-name>location08</short-name>
</ins><span class="cx"> <full-name>Location 08</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location09</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000009</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000009</guid>
</span><ins>+ <short-name>location09</short-name>
</ins><span class="cx"> <full-name>Location 09</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location10</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000010</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000010</guid>
</span><ins>+ <short-name>location10</short-name>
</ins><span class="cx"> <full-name>Location 10</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location11</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000011</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000011</guid>
</span><ins>+ <short-name>location11</short-name>
</ins><span class="cx"> <full-name>Location 11</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location12</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000012</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000012</guid>
</span><ins>+ <short-name>location12</short-name>
</ins><span class="cx"> <full-name>Location 12</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location13</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000013</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000013</guid>
</span><ins>+ <short-name>location13</short-name>
</ins><span class="cx"> <full-name>Location 13</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location14</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000014</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000014</guid>
</span><ins>+ <short-name>location14</short-name>
</ins><span class="cx"> <full-name>Location 14</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location15</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000015</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000015</guid>
</span><ins>+ <short-name>location15</short-name>
</ins><span class="cx"> <full-name>Location 15</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location16</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000016</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000016</guid>
</span><ins>+ <short-name>location16</short-name>
</ins><span class="cx"> <full-name>Location 16</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location17</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000017</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000017</guid>
</span><ins>+ <short-name>location17</short-name>
</ins><span class="cx"> <full-name>Location 17</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location18</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000018</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000018</guid>
</span><ins>+ <short-name>location18</short-name>
</ins><span class="cx"> <full-name>Location 18</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location19</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000019</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000019</guid>
</span><ins>+ <short-name>location19</short-name>
</ins><span class="cx"> <full-name>Location 19</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location20</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000020</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000020</guid>
</span><ins>+ <short-name>location20</short-name>
</ins><span class="cx"> <full-name>Location 20</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location21</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000021</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000021</guid>
</span><ins>+ <short-name>location21</short-name>
</ins><span class="cx"> <full-name>Location 21</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location22</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000022</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000022</guid>
</span><ins>+ <short-name>location22</short-name>
</ins><span class="cx"> <full-name>Location 22</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location23</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000023</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000023</guid>
</span><ins>+ <short-name>location23</short-name>
</ins><span class="cx"> <full-name>Location 23</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location24</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000024</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000024</guid>
</span><ins>+ <short-name>location24</short-name>
</ins><span class="cx"> <full-name>Location 24</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location25</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000025</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000025</guid>
</span><ins>+ <short-name>location25</short-name>
</ins><span class="cx"> <full-name>Location 25</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location26</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000026</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000026</guid>
</span><ins>+ <short-name>location26</short-name>
</ins><span class="cx"> <full-name>Location 26</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location27</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000027</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000027</guid>
</span><ins>+ <short-name>location27</short-name>
</ins><span class="cx"> <full-name>Location 27</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location28</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000028</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000028</guid>
</span><ins>+ <short-name>location28</short-name>
</ins><span class="cx"> <full-name>Location 28</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location29</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000029</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000029</guid>
</span><ins>+ <short-name>location29</short-name>
</ins><span class="cx"> <full-name>Location 29</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location30</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000030</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000030</guid>
</span><ins>+ <short-name>location30</short-name>
</ins><span class="cx"> <full-name>Location 30</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location31</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000031</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000031</guid>
</span><ins>+ <short-name>location31</short-name>
</ins><span class="cx"> <full-name>Location 31</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location32</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000032</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000032</guid>
</span><ins>+ <short-name>location32</short-name>
</ins><span class="cx"> <full-name>Location 32</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location33</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000033</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000033</guid>
</span><ins>+ <short-name>location33</short-name>
</ins><span class="cx"> <full-name>Location 33</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location34</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000034</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000034</guid>
</span><ins>+ <short-name>location34</short-name>
</ins><span class="cx"> <full-name>Location 34</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location35</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000035</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000035</guid>
</span><ins>+ <short-name>location35</short-name>
</ins><span class="cx"> <full-name>Location 35</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location36</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000036</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000036</guid>
</span><ins>+ <short-name>location36</short-name>
</ins><span class="cx"> <full-name>Location 36</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location37</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000037</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000037</guid>
</span><ins>+ <short-name>location37</short-name>
</ins><span class="cx"> <full-name>Location 37</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location38</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000038</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000038</guid>
</span><ins>+ <short-name>location38</short-name>
</ins><span class="cx"> <full-name>Location 38</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location39</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000039</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000039</guid>
</span><ins>+ <short-name>location39</short-name>
</ins><span class="cx"> <full-name>Location 39</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location40</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000040</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000040</guid>
</span><ins>+ <short-name>location40</short-name>
</ins><span class="cx"> <full-name>Location 40</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location41</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000041</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000041</guid>
</span><ins>+ <short-name>location41</short-name>
</ins><span class="cx"> <full-name>Location 41</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location42</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000042</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000042</guid>
</span><ins>+ <short-name>location42</short-name>
</ins><span class="cx"> <full-name>Location 42</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location43</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000043</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000043</guid>
</span><ins>+ <short-name>location43</short-name>
</ins><span class="cx"> <full-name>Location 43</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location44</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000044</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000044</guid>
</span><ins>+ <short-name>location44</short-name>
</ins><span class="cx"> <full-name>Location 44</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location45</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000045</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000045</guid>
</span><ins>+ <short-name>location45</short-name>
</ins><span class="cx"> <full-name>Location 45</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location46</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000046</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000046</guid>
</span><ins>+ <short-name>location46</short-name>
</ins><span class="cx"> <full-name>Location 46</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location47</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000047</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000047</guid>
</span><ins>+ <short-name>location47</short-name>
</ins><span class="cx"> <full-name>Location 47</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location48</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000048</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000048</guid>
</span><ins>+ <short-name>location48</short-name>
</ins><span class="cx"> <full-name>Location 48</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location49</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000049</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000049</guid>
</span><ins>+ <short-name>location49</short-name>
</ins><span class="cx"> <full-name>Location 49</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location50</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000050</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000050</guid>
</span><ins>+ <short-name>location50</short-name>
</ins><span class="cx"> <full-name>Location 50</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location51</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000051</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000051</guid>
</span><ins>+ <short-name>location51</short-name>
</ins><span class="cx"> <full-name>Location 51</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location52</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000052</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000052</guid>
</span><ins>+ <short-name>location52</short-name>
</ins><span class="cx"> <full-name>Location 52</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location53</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000053</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000053</guid>
</span><ins>+ <short-name>location53</short-name>
</ins><span class="cx"> <full-name>Location 53</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location54</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000054</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000054</guid>
</span><ins>+ <short-name>location54</short-name>
</ins><span class="cx"> <full-name>Location 54</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location55</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000055</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000055</guid>
</span><ins>+ <short-name>location55</short-name>
</ins><span class="cx"> <full-name>Location 55</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location56</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000056</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000056</guid>
</span><ins>+ <short-name>location56</short-name>
</ins><span class="cx"> <full-name>Location 56</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location57</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000057</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000057</guid>
</span><ins>+ <short-name>location57</short-name>
</ins><span class="cx"> <full-name>Location 57</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location58</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000058</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000058</guid>
</span><ins>+ <short-name>location58</short-name>
</ins><span class="cx"> <full-name>Location 58</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location59</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000059</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000059</guid>
</span><ins>+ <short-name>location59</short-name>
</ins><span class="cx"> <full-name>Location 59</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location60</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000060</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000060</guid>
</span><ins>+ <short-name>location60</short-name>
</ins><span class="cx"> <full-name>Location 60</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location61</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000061</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000061</guid>
</span><ins>+ <short-name>location61</short-name>
</ins><span class="cx"> <full-name>Location 61</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location62</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000062</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000062</guid>
</span><ins>+ <short-name>location62</short-name>
</ins><span class="cx"> <full-name>Location 62</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location63</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000063</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000063</guid>
</span><ins>+ <short-name>location63</short-name>
</ins><span class="cx"> <full-name>Location 63</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location64</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000064</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000064</guid>
</span><ins>+ <short-name>location64</short-name>
</ins><span class="cx"> <full-name>Location 64</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location65</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000065</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000065</guid>
</span><ins>+ <short-name>location65</short-name>
</ins><span class="cx"> <full-name>Location 65</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location66</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000066</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000066</guid>
</span><ins>+ <short-name>location66</short-name>
</ins><span class="cx"> <full-name>Location 66</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location67</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000067</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000067</guid>
</span><ins>+ <short-name>location67</short-name>
</ins><span class="cx"> <full-name>Location 67</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location68</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000068</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000068</guid>
</span><ins>+ <short-name>location68</short-name>
</ins><span class="cx"> <full-name>Location 68</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location69</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000069</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000069</guid>
</span><ins>+ <short-name>location69</short-name>
</ins><span class="cx"> <full-name>Location 69</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location70</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000070</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000070</guid>
</span><ins>+ <short-name>location70</short-name>
</ins><span class="cx"> <full-name>Location 70</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location71</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000071</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000071</guid>
</span><ins>+ <short-name>location71</short-name>
</ins><span class="cx"> <full-name>Location 71</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location72</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000072</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000072</guid>
</span><ins>+ <short-name>location72</short-name>
</ins><span class="cx"> <full-name>Location 72</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location73</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000073</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000073</guid>
</span><ins>+ <short-name>location73</short-name>
</ins><span class="cx"> <full-name>Location 73</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location74</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000074</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000074</guid>
</span><ins>+ <short-name>location74</short-name>
</ins><span class="cx"> <full-name>Location 74</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location75</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000075</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000075</guid>
</span><ins>+ <short-name>location75</short-name>
</ins><span class="cx"> <full-name>Location 75</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location76</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000076</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000076</guid>
</span><ins>+ <short-name>location76</short-name>
</ins><span class="cx"> <full-name>Location 76</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location77</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000077</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000077</guid>
</span><ins>+ <short-name>location77</short-name>
</ins><span class="cx"> <full-name>Location 77</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location78</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000078</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000078</guid>
</span><ins>+ <short-name>location78</short-name>
</ins><span class="cx"> <full-name>Location 78</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location79</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000079</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000079</guid>
</span><ins>+ <short-name>location79</short-name>
</ins><span class="cx"> <full-name>Location 79</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location80</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000080</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000080</guid>
</span><ins>+ <short-name>location80</short-name>
</ins><span class="cx"> <full-name>Location 80</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location81</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000081</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000081</guid>
</span><ins>+ <short-name>location81</short-name>
</ins><span class="cx"> <full-name>Location 81</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location82</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000082</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000082</guid>
</span><ins>+ <short-name>location82</short-name>
</ins><span class="cx"> <full-name>Location 82</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location83</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000083</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000083</guid>
</span><ins>+ <short-name>location83</short-name>
</ins><span class="cx"> <full-name>Location 83</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location84</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000084</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000084</guid>
</span><ins>+ <short-name>location84</short-name>
</ins><span class="cx"> <full-name>Location 84</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location85</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000085</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000085</guid>
</span><ins>+ <short-name>location85</short-name>
</ins><span class="cx"> <full-name>Location 85</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location86</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000086</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000086</guid>
</span><ins>+ <short-name>location86</short-name>
</ins><span class="cx"> <full-name>Location 86</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location87</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000087</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000087</guid>
</span><ins>+ <short-name>location87</short-name>
</ins><span class="cx"> <full-name>Location 87</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location88</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000088</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000088</guid>
</span><ins>+ <short-name>location88</short-name>
</ins><span class="cx"> <full-name>Location 88</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location89</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000089</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000089</guid>
</span><ins>+ <short-name>location89</short-name>
</ins><span class="cx"> <full-name>Location 89</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location90</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000090</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000090</guid>
</span><ins>+ <short-name>location90</short-name>
</ins><span class="cx"> <full-name>Location 90</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location91</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000091</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000091</guid>
</span><ins>+ <short-name>location91</short-name>
</ins><span class="cx"> <full-name>Location 91</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location92</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000092</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000092</guid>
</span><ins>+ <short-name>location92</short-name>
</ins><span class="cx"> <full-name>Location 92</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location93</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000093</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000093</guid>
</span><ins>+ <short-name>location93</short-name>
</ins><span class="cx"> <full-name>Location 93</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location94</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000094</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000094</guid>
</span><ins>+ <short-name>location94</short-name>
</ins><span class="cx"> <full-name>Location 94</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location95</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000095</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000095</guid>
</span><ins>+ <short-name>location95</short-name>
</ins><span class="cx"> <full-name>Location 95</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location96</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000096</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000096</guid>
</span><ins>+ <short-name>location96</short-name>
</ins><span class="cx"> <full-name>Location 96</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location97</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000097</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000097</guid>
</span><ins>+ <short-name>location97</short-name>
</ins><span class="cx"> <full-name>Location 97</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location98</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000098</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000098</guid>
</span><ins>+ <short-name>location98</short-name>
</ins><span class="cx"> <full-name>Location 98</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location99</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000099</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000099</guid>
</span><ins>+ <short-name>location99</short-name>
</ins><span class="cx"> <full-name>Location 99</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location100</short-name>
</del><span class="cx"> <uid>30000000-0000-0000-0000-000000000100</uid>
</span><span class="cx"> <guid>30000000-0000-0000-0000-000000000100</guid>
</span><ins>+ <short-name>location100</short-name>
</ins><span class="cx"> <full-name>Location 100</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource01</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000001</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000001</guid>
</span><ins>+ <short-name>resource01</short-name>
</ins><span class="cx"> <full-name>Resource 01</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource02</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000002</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000002</guid>
</span><ins>+ <short-name>resource02</short-name>
</ins><span class="cx"> <full-name>Resource 02</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource03</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000003</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000003</guid>
</span><ins>+ <short-name>resource03</short-name>
</ins><span class="cx"> <full-name>Resource 03</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource04</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000004</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000004</guid>
</span><ins>+ <short-name>resource04</short-name>
</ins><span class="cx"> <full-name>Resource 04</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource05</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000005</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000005</guid>
</span><ins>+ <short-name>resource05</short-name>
</ins><span class="cx"> <full-name>Resource 05</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource06</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000006</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000006</guid>
</span><ins>+ <short-name>resource06</short-name>
</ins><span class="cx"> <full-name>Resource 06</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource07</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000007</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000007</guid>
</span><ins>+ <short-name>resource07</short-name>
</ins><span class="cx"> <full-name>Resource 07</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource08</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000008</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000008</guid>
</span><ins>+ <short-name>resource08</short-name>
</ins><span class="cx"> <full-name>Resource 08</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource09</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000009</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000009</guid>
</span><ins>+ <short-name>resource09</short-name>
</ins><span class="cx"> <full-name>Resource 09</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource10</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000010</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000010</guid>
</span><ins>+ <short-name>resource10</short-name>
</ins><span class="cx"> <full-name>Resource 10</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource11</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000011</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000011</guid>
</span><ins>+ <short-name>resource11</short-name>
</ins><span class="cx"> <full-name>Resource 11</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource12</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000012</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000012</guid>
</span><ins>+ <short-name>resource12</short-name>
</ins><span class="cx"> <full-name>Resource 12</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource13</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000013</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000013</guid>
</span><ins>+ <short-name>resource13</short-name>
</ins><span class="cx"> <full-name>Resource 13</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource14</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000014</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000014</guid>
</span><ins>+ <short-name>resource14</short-name>
</ins><span class="cx"> <full-name>Resource 14</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource15</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000015</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000015</guid>
</span><ins>+ <short-name>resource15</short-name>
</ins><span class="cx"> <full-name>Resource 15</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource16</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000016</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000016</guid>
</span><ins>+ <short-name>resource16</short-name>
</ins><span class="cx"> <full-name>Resource 16</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource17</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000017</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000017</guid>
</span><ins>+ <short-name>resource17</short-name>
</ins><span class="cx"> <full-name>Resource 17</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource18</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000018</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000018</guid>
</span><ins>+ <short-name>resource18</short-name>
</ins><span class="cx"> <full-name>Resource 18</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource19</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000019</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000019</guid>
</span><ins>+ <short-name>resource19</short-name>
</ins><span class="cx"> <full-name>Resource 19</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource20</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000020</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000020</guid>
</span><ins>+ <short-name>resource20</short-name>
</ins><span class="cx"> <full-name>Resource 20</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource21</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000021</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000021</guid>
</span><ins>+ <short-name>resource21</short-name>
</ins><span class="cx"> <full-name>Resource 21</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource22</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000022</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000022</guid>
</span><ins>+ <short-name>resource22</short-name>
</ins><span class="cx"> <full-name>Resource 22</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource23</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000023</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000023</guid>
</span><ins>+ <short-name>resource23</short-name>
</ins><span class="cx"> <full-name>Resource 23</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource24</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000024</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000024</guid>
</span><ins>+ <short-name>resource24</short-name>
</ins><span class="cx"> <full-name>Resource 24</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource25</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000025</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000025</guid>
</span><ins>+ <short-name>resource25</short-name>
</ins><span class="cx"> <full-name>Resource 25</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource26</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000026</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000026</guid>
</span><ins>+ <short-name>resource26</short-name>
</ins><span class="cx"> <full-name>Resource 26</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource27</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000027</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000027</guid>
</span><ins>+ <short-name>resource27</short-name>
</ins><span class="cx"> <full-name>Resource 27</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource28</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000028</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000028</guid>
</span><ins>+ <short-name>resource28</short-name>
</ins><span class="cx"> <full-name>Resource 28</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource29</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000029</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000029</guid>
</span><ins>+ <short-name>resource29</short-name>
</ins><span class="cx"> <full-name>Resource 29</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource30</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000030</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000030</guid>
</span><ins>+ <short-name>resource30</short-name>
</ins><span class="cx"> <full-name>Resource 30</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource31</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000031</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000031</guid>
</span><ins>+ <short-name>resource31</short-name>
</ins><span class="cx"> <full-name>Resource 31</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource32</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000032</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000032</guid>
</span><ins>+ <short-name>resource32</short-name>
</ins><span class="cx"> <full-name>Resource 32</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource33</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000033</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000033</guid>
</span><ins>+ <short-name>resource33</short-name>
</ins><span class="cx"> <full-name>Resource 33</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource34</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000034</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000034</guid>
</span><ins>+ <short-name>resource34</short-name>
</ins><span class="cx"> <full-name>Resource 34</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource35</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000035</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000035</guid>
</span><ins>+ <short-name>resource35</short-name>
</ins><span class="cx"> <full-name>Resource 35</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource36</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000036</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000036</guid>
</span><ins>+ <short-name>resource36</short-name>
</ins><span class="cx"> <full-name>Resource 36</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource37</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000037</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000037</guid>
</span><ins>+ <short-name>resource37</short-name>
</ins><span class="cx"> <full-name>Resource 37</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource38</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000038</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000038</guid>
</span><ins>+ <short-name>resource38</short-name>
</ins><span class="cx"> <full-name>Resource 38</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource39</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000039</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000039</guid>
</span><ins>+ <short-name>resource39</short-name>
</ins><span class="cx"> <full-name>Resource 39</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource40</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000040</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000040</guid>
</span><ins>+ <short-name>resource40</short-name>
</ins><span class="cx"> <full-name>Resource 40</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource41</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000041</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000041</guid>
</span><ins>+ <short-name>resource41</short-name>
</ins><span class="cx"> <full-name>Resource 41</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource42</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000042</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000042</guid>
</span><ins>+ <short-name>resource42</short-name>
</ins><span class="cx"> <full-name>Resource 42</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource43</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000043</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000043</guid>
</span><ins>+ <short-name>resource43</short-name>
</ins><span class="cx"> <full-name>Resource 43</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource44</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000044</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000044</guid>
</span><ins>+ <short-name>resource44</short-name>
</ins><span class="cx"> <full-name>Resource 44</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource45</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000045</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000045</guid>
</span><ins>+ <short-name>resource45</short-name>
</ins><span class="cx"> <full-name>Resource 45</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource46</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000046</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000046</guid>
</span><ins>+ <short-name>resource46</short-name>
</ins><span class="cx"> <full-name>Resource 46</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource47</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000047</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000047</guid>
</span><ins>+ <short-name>resource47</short-name>
</ins><span class="cx"> <full-name>Resource 47</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource48</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000048</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000048</guid>
</span><ins>+ <short-name>resource48</short-name>
</ins><span class="cx"> <full-name>Resource 48</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource49</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000049</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000049</guid>
</span><ins>+ <short-name>resource49</short-name>
</ins><span class="cx"> <full-name>Resource 49</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource50</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000050</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000050</guid>
</span><ins>+ <short-name>resource50</short-name>
</ins><span class="cx"> <full-name>Resource 50</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource51</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000051</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000051</guid>
</span><ins>+ <short-name>resource51</short-name>
</ins><span class="cx"> <full-name>Resource 51</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource52</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000052</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000052</guid>
</span><ins>+ <short-name>resource52</short-name>
</ins><span class="cx"> <full-name>Resource 52</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource53</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000053</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000053</guid>
</span><ins>+ <short-name>resource53</short-name>
</ins><span class="cx"> <full-name>Resource 53</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource54</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000054</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000054</guid>
</span><ins>+ <short-name>resource54</short-name>
</ins><span class="cx"> <full-name>Resource 54</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource55</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000055</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000055</guid>
</span><ins>+ <short-name>resource55</short-name>
</ins><span class="cx"> <full-name>Resource 55</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource56</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000056</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000056</guid>
</span><ins>+ <short-name>resource56</short-name>
</ins><span class="cx"> <full-name>Resource 56</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource57</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000057</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000057</guid>
</span><ins>+ <short-name>resource57</short-name>
</ins><span class="cx"> <full-name>Resource 57</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource58</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000058</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000058</guid>
</span><ins>+ <short-name>resource58</short-name>
</ins><span class="cx"> <full-name>Resource 58</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource59</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000059</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000059</guid>
</span><ins>+ <short-name>resource59</short-name>
</ins><span class="cx"> <full-name>Resource 59</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource60</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000060</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000060</guid>
</span><ins>+ <short-name>resource60</short-name>
</ins><span class="cx"> <full-name>Resource 60</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource61</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000061</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000061</guid>
</span><ins>+ <short-name>resource61</short-name>
</ins><span class="cx"> <full-name>Resource 61</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource62</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000062</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000062</guid>
</span><ins>+ <short-name>resource62</short-name>
</ins><span class="cx"> <full-name>Resource 62</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource63</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000063</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000063</guid>
</span><ins>+ <short-name>resource63</short-name>
</ins><span class="cx"> <full-name>Resource 63</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource64</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000064</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000064</guid>
</span><ins>+ <short-name>resource64</short-name>
</ins><span class="cx"> <full-name>Resource 64</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource65</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000065</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000065</guid>
</span><ins>+ <short-name>resource65</short-name>
</ins><span class="cx"> <full-name>Resource 65</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource66</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000066</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000066</guid>
</span><ins>+ <short-name>resource66</short-name>
</ins><span class="cx"> <full-name>Resource 66</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource67</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000067</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000067</guid>
</span><ins>+ <short-name>resource67</short-name>
</ins><span class="cx"> <full-name>Resource 67</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource68</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000068</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000068</guid>
</span><ins>+ <short-name>resource68</short-name>
</ins><span class="cx"> <full-name>Resource 68</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource69</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000069</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000069</guid>
</span><ins>+ <short-name>resource69</short-name>
</ins><span class="cx"> <full-name>Resource 69</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource70</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000070</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000070</guid>
</span><ins>+ <short-name>resource70</short-name>
</ins><span class="cx"> <full-name>Resource 70</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource71</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000071</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000071</guid>
</span><ins>+ <short-name>resource71</short-name>
</ins><span class="cx"> <full-name>Resource 71</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource72</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000072</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000072</guid>
</span><ins>+ <short-name>resource72</short-name>
</ins><span class="cx"> <full-name>Resource 72</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource73</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000073</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000073</guid>
</span><ins>+ <short-name>resource73</short-name>
</ins><span class="cx"> <full-name>Resource 73</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource74</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000074</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000074</guid>
</span><ins>+ <short-name>resource74</short-name>
</ins><span class="cx"> <full-name>Resource 74</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource75</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000075</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000075</guid>
</span><ins>+ <short-name>resource75</short-name>
</ins><span class="cx"> <full-name>Resource 75</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource76</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000076</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000076</guid>
</span><ins>+ <short-name>resource76</short-name>
</ins><span class="cx"> <full-name>Resource 76</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource77</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000077</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000077</guid>
</span><ins>+ <short-name>resource77</short-name>
</ins><span class="cx"> <full-name>Resource 77</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource78</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000078</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000078</guid>
</span><ins>+ <short-name>resource78</short-name>
</ins><span class="cx"> <full-name>Resource 78</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource79</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000079</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000079</guid>
</span><ins>+ <short-name>resource79</short-name>
</ins><span class="cx"> <full-name>Resource 79</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource80</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000080</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000080</guid>
</span><ins>+ <short-name>resource80</short-name>
</ins><span class="cx"> <full-name>Resource 80</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource81</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000081</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000081</guid>
</span><ins>+ <short-name>resource81</short-name>
</ins><span class="cx"> <full-name>Resource 81</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource82</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000082</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000082</guid>
</span><ins>+ <short-name>resource82</short-name>
</ins><span class="cx"> <full-name>Resource 82</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource83</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000083</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000083</guid>
</span><ins>+ <short-name>resource83</short-name>
</ins><span class="cx"> <full-name>Resource 83</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource84</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000084</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000084</guid>
</span><ins>+ <short-name>resource84</short-name>
</ins><span class="cx"> <full-name>Resource 84</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource85</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000085</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000085</guid>
</span><ins>+ <short-name>resource85</short-name>
</ins><span class="cx"> <full-name>Resource 85</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource86</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000086</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000086</guid>
</span><ins>+ <short-name>resource86</short-name>
</ins><span class="cx"> <full-name>Resource 86</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource87</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000087</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000087</guid>
</span><ins>+ <short-name>resource87</short-name>
</ins><span class="cx"> <full-name>Resource 87</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource88</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000088</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000088</guid>
</span><ins>+ <short-name>resource88</short-name>
</ins><span class="cx"> <full-name>Resource 88</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource89</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000089</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000089</guid>
</span><ins>+ <short-name>resource89</short-name>
</ins><span class="cx"> <full-name>Resource 89</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource90</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000090</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000090</guid>
</span><ins>+ <short-name>resource90</short-name>
</ins><span class="cx"> <full-name>Resource 90</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource91</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000091</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000091</guid>
</span><ins>+ <short-name>resource91</short-name>
</ins><span class="cx"> <full-name>Resource 91</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource92</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000092</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000092</guid>
</span><ins>+ <short-name>resource92</short-name>
</ins><span class="cx"> <full-name>Resource 92</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource93</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000093</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000093</guid>
</span><ins>+ <short-name>resource93</short-name>
</ins><span class="cx"> <full-name>Resource 93</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource94</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000094</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000094</guid>
</span><ins>+ <short-name>resource94</short-name>
</ins><span class="cx"> <full-name>Resource 94</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource95</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000095</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000095</guid>
</span><ins>+ <short-name>resource95</short-name>
</ins><span class="cx"> <full-name>Resource 95</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource96</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000096</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000096</guid>
</span><ins>+ <short-name>resource96</short-name>
</ins><span class="cx"> <full-name>Resource 96</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource97</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000097</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000097</guid>
</span><ins>+ <short-name>resource97</short-name>
</ins><span class="cx"> <full-name>Resource 97</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource98</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000098</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000098</guid>
</span><ins>+ <short-name>resource98</short-name>
</ins><span class="cx"> <full-name>Resource 98</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource99</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000099</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000099</guid>
</span><ins>+ <short-name>resource99</short-name>
</ins><span class="cx"> <full-name>Resource 99</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="resource">
</span><del>- <short-name>resource100</short-name>
</del><span class="cx"> <uid>40000000-0000-0000-0000-000000000100</uid>
</span><span class="cx"> <guid>40000000-0000-0000-0000-000000000100</guid>
</span><ins>+ <short-name>resource100</short-name>
</ins><span class="cx"> <full-name>Resource 100</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> </directory>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdtestpodAplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test-podA.plist (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test-podA.plist 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/caldavd-test-podA.plist 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -110,6 +110,62 @@
</span><span class="cx"> <string>podding</string>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><ins>+ <key>Scheduling</key>
+ <dict>
+ <!-- iSchedule protocol options -->
+ <key>iSchedule</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>AddressPatterns</key>
+ <array>
+ </array>
+ <key>RemoteServers</key>
+ <string>remoteservers-test.xml</string>
+ <key>DNSDebug</key>
+ <string>test-db.zones</string>
+ <key>DKIM</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>Domain</key>
+ <string>example.com</string>
+ <key>KeySelector</key>
+ <string>ischedule</string>
+ <key>UseDNSKey</key>
+ <false/>
+ <key>UseHTTPKey</key>
+ <true/>
+ <key>UsePrivateExchangeKey</key>
+ <true/>
+ <key>ExpireSeconds</key>
+ <integer>3600</integer>
+ <key>PrivateKeyFile</key>
+ <string>dkim-test/priv.pem</string>
+ <key>PublicKeyFile</key>
+ <string>dkim-test/pub.pem</string>
+ <key>PrivateExchanges</key>
+ <string>dkim-test/other_keys</string>
+ <key>ProtocolDebug</key>
+ <true/>
+ </dict>
+ </dict>
+ </dict>
+
+ <key>Notifications</key>
+ <dict>
+ <key>Services</key>
+ <dict>
+
+ <key>AMP</key>
+ <dict>
+ <key>Enabled</key>
+ <false/>
+ </dict>
+
+ </dict>
+ </dict>
+
</ins><span class="cx"> <!-- Support for Memcached -->
</span><span class="cx"> <key>Memcached</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdtestpodBplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test-podB.plist (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test-podB.plist 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/caldavd-test-podB.plist 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -130,6 +130,62 @@
</span><span class="cx"> <string>podding</string>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><ins>+ <key>Scheduling</key>
+ <dict>
+ <!-- iSchedule protocol options -->
+ <key>iSchedule</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>AddressPatterns</key>
+ <array>
+ </array>
+ <key>RemoteServers</key>
+ <string>remoteservers-test.xml</string>
+ <key>DNSDebug</key>
+ <string>test-db.zones</string>
+ <key>DKIM</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>Domain</key>
+ <string>example.com</string>
+ <key>KeySelector</key>
+ <string>ischedule</string>
+ <key>UseDNSKey</key>
+ <false/>
+ <key>UseHTTPKey</key>
+ <true/>
+ <key>UsePrivateExchangeKey</key>
+ <true/>
+ <key>ExpireSeconds</key>
+ <integer>3600</integer>
+ <key>PrivateKeyFile</key>
+ <string>dkim-test/priv.pem</string>
+ <key>PublicKeyFile</key>
+ <string>dkim-test/pub.pem</string>
+ <key>PrivateExchanges</key>
+ <string>dkim-test/other_keys</string>
+ <key>ProtocolDebug</key>
+ <true/>
+ </dict>
+ </dict>
+ </dict>
+
+ <key>Notifications</key>
+ <dict>
+ <key>Services</key>
+ <dict>
+
+ <key>AMP</key>
+ <dict>
+ <key>Enabled</key>
+ <false/>
+ </dict>
+
+ </dict>
+ </dict>
+
</ins><span class="cx"> <!-- Support for Memcached -->
</span><span class="cx"> <key>Memcached</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdtests2splist"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/caldavd-test-s2s.plist (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test-s2s.plist (rev 0)
+++ CalendarServer/trunk/conf/caldavd-test-s2s.plist 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,184 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+
+ <!-- Import a parent config before this one -->
+ <key>ImportConfig</key>
+ <string>./conf/caldavd-test.plist</string>
+
+ <!-- HTTP port [0 = disable HTTP] -->
+ <key>HTTPPort</key>
+ <integer>8208</integer>
+
+ <!-- SSL port [0 = disable HTTPS] -->
+ <!-- (Must also configure SSLCertificate and SSLPrivateKey below) -->
+ <key>SSLPort</key>
+ <integer>8643</integer>
+
+ <!-- List of port numbers to bind to for HTTP [empty = same as "Port"] -->
+ <key>BindHTTPPorts</key>
+ <array>
+ </array>
+
+ <!-- List of port numbers to bind to for SSL [empty = same as "SSLPort"] -->
+ <key>BindSSLPorts</key>
+ <array>
+ </array>
+
+ <!-- Server root -->
+ <key>ServerRoot</key>
+ <string>./data/s2s</string>
+
+ <!-- Configuration root -->
+ <key>ConfigRoot</key>
+ <string>./conf</string>
+
+ <!-- XML File Directory Service -->
+ <key>DirectoryService</key>
+ <dict>
+ <key>type</key>
+ <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
+
+ <key>params</key>
+ <dict>
+ <key>xmlFile</key>
+ <string>./conf/auth/accounts-test-s2s.xml</string>
+ </dict>
+ </dict>
+
+ <!-- Resource and Location Service -->
+ <key>ResourceService</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>type</key>
+ <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
+
+ <key>params</key>
+ <dict>
+ <key>xmlFile</key>
+ <string>./conf/auth/resources-test-s2s.xml</string>
+ </dict>
+ </dict>
+
+ <!-- XML File Augment Service -->
+ <key>AugmentService</key>
+ <dict>
+ <key>type</key>
+ <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
+
+ <key>params</key>
+ <dict>
+ <key>xmlFiles</key>
+ <array>
+ <string>./conf/auth/augments-test-s2s.xml</string>
+ </array>
+ </dict>
+ </dict>
+
+ <key>ProxyLoadFromFile</key>
+ <string>./conf/auth/proxies-test-s2s.xml</string>
+
+ <key>Scheduling</key>
+ <dict>
+ <!-- iSchedule protocol options -->
+ <key>iSchedule</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>AddressPatterns</key>
+ <array>
+ </array>
+ <key>RemoteServers</key>
+ <string>remoteservers-test-s2s.xml</string>
+ <key>DNSDebug</key>
+ <string>test-db.zones</string>
+ <key>DKIM</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>Domain</key>
+ <string>example.org</string>
+ <key>KeySelector</key>
+ <string>ischedule2</string>
+ <key>UseDNSKey</key>
+ <false/>
+ <key>UseHTTPKey</key>
+ <true/>
+ <key>UsePrivateExchangeKey</key>
+ <true/>
+ <key>ExpireSeconds</key>
+ <integer>3600</integer>
+ <key>PrivateKeyFile</key>
+ <string>dkim-test-s2s/priv.pem</string>
+ <key>PublicKeyFile</key>
+ <string>dkim-test-s2s/pub.pem</string>
+ <key>PrivateExchanges</key>
+ <string>dkim-test-s2s/other_keys</string>
+ <key>ProtocolDebug</key>
+ <true/>
+ </dict>
+ </dict>
+ </dict>
+
+ <key>Notifications</key>
+ <dict>
+ <key>Services</key>
+ <dict>
+
+ <key>AMP</key>
+ <dict>
+ <key>Enabled</key>
+ <false/>
+ </dict>
+
+ </dict>
+ </dict>
+
+ <!-- Support for Memcached -->
+ <key>Memcached</key>
+ <dict>
+ <key>Pools</key>
+ <dict>
+ <key>Default</key>
+ <dict>
+ <key>ClientEnabled</key>
+ <true/>
+ <key>ServerEnabled</key>
+ <true/>
+ <key>BindAddress</key>
+ <string>localhost</string>
+ <key>Port</key>
+ <integer>11511</integer>
+ </dict>
+ </dict>
+ <key>MaxClients</key>
+ <integer>5</integer>
+ <key>memcached</key>
+ <string>../memcached/_root/bin/memcached</string> <!-- Find in PATH -->
+ <key>Options</key>
+ <array>
+ <!--<string>-vv</string>-->
+ </array>
+ </dict>
+
+ </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServertrunkconfdkimtestother_keysexampleorgischedule2"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/dkim-test/other_keys/example.org#ischedule2 (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/dkim-test/other_keys/example.org#ischedule2 (rev 0)
+++ CalendarServer/trunk/conf/dkim-test/other_keys/example.org#ischedule2 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwwGYRfC59jFg7D8cvwdFDoxhnyZQh77dcl/1dvyMOz4leU/JSCp7M/cCh5Bgw440deV483sr1jCkyychIgBZCaPSHqItfwRgKPntnifuCzWHfv5gZE+JI+tWBXvUs4ao4dWH7VjmUyj49QfZ/NGNKKG2Xtr3In7/7qdbfg7tVRQIDAQAB
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="CalendarServertrunkconfdkimtestprivpem"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/dkim-test/priv.pem (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/dkim-test/priv.pem (rev 0)
+++ CalendarServer/trunk/conf/dkim-test/priv.pem 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQDtocSHvSS1Nn0uIL4Sg+0wp6KcW31WRC4Fww8P+jvsVAazVOxv
+xkShNSd18EvApiNa55P8WgKVEu02OQePjnjKNqfgJPeajkWy/0CJn+d6rX/ncPMG
+X2EYzqXy/CyVqpcnVAosToymo6VHL6ufhzlyLJFDznLtV121CZLUZlAySQIDAQAB
+AoGBAJhsO/hpTUNjKRZOcDzGHH0p+bbbRGDyKKcPf/japFcpaobbATGM9naE9sPC
+l4SBzInBov2p6qAeXMN7/yqI01Z9EQEXBHXfMFSrvbAMQFwhqLTwDQWh1S32GAPQ
+Fkf2NkUjK6DDqgeT3LJrehTmSjwZTN6T+WRpkGaAvYAQIywRAkEA+4uIInt+OuZN
+7ZXBwfms5oDuFOdToiDedglnNVzQmJ4AcPqakgnF9tsQipDnvlOVHqjujmYXpOgK
+7MRNMycMNQJBAPHXJ+GdSfiuVrPbRQOg+9v6AdaP3+7fUJ8I8kGhr/vrn8lZziPZ
+/3W96pG2Dly6j+eQ3vk/3ATHD7PziAlPSEUCQQCiJTZSq/IZe30+Keuk4xFt4CwX
+82l4t+FOiw8pWbPovOih6xiaDIy8bEeEWpXXnL8h7VkhF3QkS6NHLd5pm8EFAkEA
+2l8GEvH8/kEl5wfCXJF7ellYWY7WjJI28TOZ1GuUReyv/pdJzROmWYHgkiwK8e4/
+zMACppvkJqg8ZKgtGQLu5QJAQ3D2RjXwZukcwmcOfykU7A3FoItC6JVxVBrZwq0x
+9/7WfuHF5ayWDvo1xMJkzlSsL5lsHOQzmvf0JbKhkToazw==
+-----END RSA PRIVATE KEY-----
</ins></span></pre></div>
<a id="CalendarServertrunkconfdkimtestpubpem"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/dkim-test/pub.pem (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/dkim-test/pub.pem (rev 0)
+++ CalendarServer/trunk/conf/dkim-test/pub.pem 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDtocSHvSS1Nn0uIL4Sg+0wp6Kc
+W31WRC4Fww8P+jvsVAazVOxvxkShNSd18EvApiNa55P8WgKVEu02OQePjnjKNqfg
+JPeajkWy/0CJn+d6rX/ncPMGX2EYzqXy/CyVqpcnVAosToymo6VHL6ufhzlyLJFD
+znLtV121CZLUZlAySQIDAQAB
+-----END PUBLIC KEY-----
</ins></span></pre></div>
<a id="CalendarServertrunkconfdkimtests2sother_keysexamplecomischedule"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/dkim-test-s2s/other_keys/example.com#ischedule (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/dkim-test-s2s/other_keys/example.com#ischedule (rev 0)
+++ CalendarServer/trunk/conf/dkim-test-s2s/other_keys/example.com#ischedule 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDtocSHvSS1Nn0uIL4Sg+0wp6KcW31WRC4Fww8P+jvsVAazVOxvxkShNSd18EvApiNa55P8WgKVEu02OQePjnjKNqfgJPeajkWy/0CJn+d6rX/ncPMGX2EYzqXy/CyVqpcnVAosToymo6VHL6ufhzlyLJFDznLtV121CZLUZlAySQIDAQAB
</ins></span></pre></div>
<a id="CalendarServertrunkconfdkimtests2sprivpem"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/dkim-test-s2s/priv.pem (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/dkim-test-s2s/priv.pem (rev 0)
+++ CalendarServer/trunk/conf/dkim-test-s2s/priv.pem 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQCwwGYRfC59jFg7D8cvwdFDoxhnyZQh77dcl/1dvyMOz4leU/JS
+Cp7M/cCh5Bgw440deV483sr1jCkyychIgBZCaPSHqItfwRgKPntnifuCzWHfv5gZ
+E+JI+tWBXvUs4ao4dWH7VjmUyj49QfZ/NGNKKG2Xtr3In7/7qdbfg7tVRQIDAQAB
+AoGAVSS5hl69vnjm37ygBR9mgSCF1ylBlH93YsFMqeYzKyVKVQg3SNIY4UKzksjf
+5l0XU0Vt4gCo4FQeXHrbYiFhltrB6l9uIH3bUHRK4pCI7IUe6pjKGTKxN4pX6+eA
+62PzBzbVLuc1rI2D57yzUgkpR8e1PkdVCZLH+eJC1kSffZkCQQDiqJVDi6ZeAINO
+5rxlAB+mnboQ2qvhJ0Z0nM5aauCpHkvypQTLxncez/fAvi2C/pbOxflUgV5ef7FZ
+dgLI/xQHAkEAx6Hor29mxejI1R5RwYWF5/VvjsCnbip1I9ToiqO8heLwmUcgL24S
+9Mfdiv2nJCxV7UtjLwJU0PY73KQx3JmxUwJAPzGBbDOjTtIVygnKvN4r9OhE2C4f
+fcbVfe26Grtxp7Uqt5wKmkXbMFwLV1GunrcclMndmhH3naE8cRTV8fQsQQJARh19
+xjBQXm52KzQs7tVgxKmVdwP/SlgrMFyVGCyOCFA+xPcQPNhiXAreqvSQAcp4m5GA
+0n/1Hjd9qu8YfCyW9QJAa8fiAT75cDtxRS+YsUjAwawmleaDclQDDPO4bMkq0nTd
+2dQpov79tiNCPV8CFh64GPdGC2Lyv7ZXusEo4QBzJw==
+-----END RSA PRIVATE KEY-----
</ins></span></pre></div>
<a id="CalendarServertrunkconfdkimtests2spubpem"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/dkim-test-s2s/pub.pem (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/dkim-test-s2s/pub.pem (rev 0)
+++ CalendarServer/trunk/conf/dkim-test-s2s/pub.pem 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwwGYRfC59jFg7D8cvwdFDoxhn
+yZQh77dcl/1dvyMOz4leU/JSCp7M/cCh5Bgw440deV483sr1jCkyychIgBZCaPSH
+qItfwRgKPntnifuCzWHfv5gZE+JI+tWBXvUs4ao4dWH7VjmUyj49QfZ/NGNKKG2X
+tr3In7/7qdbfg7tVRQIDAQAB
+-----END PUBLIC KEY-----
</ins></span></pre></div>
<a id="CalendarServertrunkconfremoteserverstests2sxml"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/remoteservers-test-s2s.xml (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/remoteservers-test-s2s.xml (rev 0)
+++ CalendarServer/trunk/conf/remoteservers-test-s2s.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<!DOCTYPE servers SYSTEM "remoteservers.dtd">
+
+<servers>
+ <server>
+ <uri>https://localhost:8443/ischedule</uri>
+ <allow-requests-from/>
+ <allow-requests-to/>
+ <domains>
+ <domain>example.com</domain>
+ </domains>
+ <hosts>
+ <host>127.0.0.1</host>
+ </hosts>
+ </server>
+</servers>
</ins></span></pre></div>
<a id="CalendarServertrunkconfremoteserverstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/remoteservers-test.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/remoteservers-test.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/conf/remoteservers-test.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx"> <servers>
</span><span class="cx"> <server>
</span><del>- <uri>https://localhost:8543/inbox</uri>
</del><ins>+ <uri>https://localhost:8643/ischedule</uri>
</ins><span class="cx"> <allow-requests-from/>
</span><span class="cx"> <allow-requests-to/>
</span><span class="cx"> <domains>
</span></span></pre></div>
<a id="CalendarServertrunkconftestdbzones"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/conf/test-db.zones (0 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/test-db.zones (rev 0)
+++ CalendarServer/trunk/conf/test-db.zones 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+example.com. 10800 IN SOA ns.example.com. admin.example.com. (
+ 2012090810 ; serial
+ 3600 ; refresh (1 hour)
+ 900 ; retry (15 minutes)
+ 1209600 ; expire (2 weeks)
+ 86400 ; minimum (1 day)
+ )
+ 10800 IN NS ns.example.com.
+ 10800 IN A 127.0.0.1
+ns.example.com. 10800 IN A 127.0.0.1
+
+_caldavs._tcp.example.com. 10800 IN SRV 0 0 8443 example.com.
+_ischedules._tcp.example.com. 10800 IN SRV 0 0 8443 example.com.
+ischedule._domainkey.example.com. 10800 IN TXT "v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDtocSHvSS1Nn0uIL4Sg+0wp6KcW31WRC4Fww8P+jvsVAazVOxvxkShNSd18EvApiNa55P8WgKVEu02OQePjnjKNqfgJPeajkWy/0CJn+d6rX/ncPMGX2EYzqXy/CyVqpcnVAosToymo6VHL6ufhzlyLJFDznLtV121CZLUZlAySQIDAQAB"
+
+
+
+example.org. 10800 IN SOA ns.example.org. admin.example.org. (
+ 2012090810 ; serial
+ 3600 ; refresh (1 hour)
+ 900 ; retry (15 minutes)
+ 1209600 ; expire (2 weeks)
+ 86400 ; minimum (1 day)
+ )
+ 10800 IN NS ns.example.org.
+ 10800 IN A 127.0.0.1
+ns.example.org. 10800 IN A 127.0.0.1
+
+_caldavs._tcp.example.org. 10800 IN SRV 0 0 8643 example.org.
+_ischedules._tcp.example.org. 10800 IN SRV 0 0 8643 calendar.example.org.
+ischedule2._domainkey.example.org. 10800 IN TXT "v=DKIM1; s=ischedule; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwwGYRfC59jFg7D8cvwdFDoxhnyZQh77dcl/1dvyMOz4leU/JSCp7M/cCh5Bgw440deV483sr1jCkyychIgBZCaPSHqItfwRgKPntnifuCzWHfv5gZE+JI+tWBXvUs4ao4dWH7VjmUyj49QfZ/NGNKKG2Xtr3In7/7qdbfg7tVRQIDAQAB"
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorycalendaruserproxyloaderpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxyloader.py (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxyloader.py 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxyloader.py 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> ELEMENT_RECORD = "record"
</span><span class="cx">
</span><span class="cx"> ELEMENT_GUID = "guid"
</span><del>-ELEMENT_PROXIES = "proxies"
-ELEMENT_READ_ONLY_PROXIES = "read-only-proxies"
</del><ins>+ELEMENT_WRITE_PROXIES = "write-proxies"
+ELEMENT_READ_PROXIES = "read-proxies"
</ins><span class="cx"> ELEMENT_MEMBER = "member"
</span><span class="cx">
</span><span class="cx"> ATTRIBUTE_REPEAT = "repeat"
</span><span class="lines">@@ -89,10 +89,10 @@
</span><span class="cx"> guid = node.text
</span><span class="cx">
</span><span class="cx"> elif node.tag in (
</span><del>- ELEMENT_PROXIES,
- ELEMENT_READ_ONLY_PROXIES,
</del><ins>+ ELEMENT_WRITE_PROXIES,
+ ELEMENT_READ_PROXIES,
</ins><span class="cx"> ):
</span><del>- self._parseMembers(node, write_proxies if node.tag == ELEMENT_PROXIES else read_proxies)
</del><ins>+ self._parseMembers(node, write_proxies if node.tag == ELEMENT_WRITE_PROXIES else read_proxies)
</ins><span class="cx"> else:
</span><span class="cx"> raise RuntimeError("Invalid element '%s' in proxies file: '%s'" % (node.tag, self.xmlFile,))
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytestaccountsmodifiedxml"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/twistedcaldav/directory/test/accounts-modified.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/accounts-modified.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/test/accounts-modified.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -1,298 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2012-2014 Apple Inc. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Description:
-
-This file is a copy of accounts.xml with wsanchez removed from
-all groups, for the purposes of test_groupMembershipCacheUpdater( ).
- -->
-
-<!DOCTYPE accounts SYSTEM "../../../conf/auth/accounts.dtd">
-
-<accounts realm="Test">
- <user>
- <uid>admin</uid>
- <guid>D11F03A0-97EA-48AF-9A6C-FAC7F3975766</guid>
- <password>nimda</password>
- <name>Administrators</name>
- </user>
- <user>
- <uid>wsanchez</uid>
- <guid>6423F94A-6B76-4A3A-815B-D52CFD77935D</guid>
- <password>zehcnasw</password>
- <name>Wilfredo Sanchez</name>
- <email-address>wsanchez@example.com</email-address>
- </user>
- <user>
- <uid>cdaboo</uid>
- <guid>5A985493-EE2C-4665-94CF-4DFEA3A89500</guid>
- <password>oobadc</password>
- <name>Cyrus Daboo</name>
- <email-address>cdaboo@example.com</email-address>
- </user>
- <user>
- <uid>lecroy</uid>
- <guid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</guid>
- <password>yorcel</password>
- <name>Chris Lecroy</name>
- <email-address>lecroy@example.com</email-address>
- </user>
- <user>
- <uid>dreid</uid>
- <guid>5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</guid>
- <password>dierd</password>
- <name>David Reid</name>
- <email-address>dreid@example.com</email-address>
- </user>
- <user>
- <uid>doublequotes</uid>
- <guid>8E04787E-336D-41ED-A70B-D233AD0DCE6F</guid>
- <password>setouqelbuod</password>
- <name>Double "quotey" Quotes</name>
- <email-address>doublequotes@example.com</email-address>
- </user>
- <user>
- <uid>nocalendar</uid>
- <guid>543D28BA-F74F-4D5F-9243-B3E3A61171E5</guid>
- <password>radnelacon</password>
- <name>No Calendar</name>
- <email-address>nocalendar@example.com</email-address>
- </user>
- <user>
- <uid>usera</uid>
- <guid>7423F94A-6B76-4A3A-815B-D52CFD77935D</guid>
- <password>a</password>
- <name>a</name>
- <email-address>a@example.com</email-address>
- </user>
- <user>
- <uid>userb</uid>
- <guid>8A985493-EE2C-4665-94CF-4DFEA3A89500</guid>
- <password>b</password>
- <name>b</name>
- <email-address>b@example.com</email-address>
- </user>
- <user>
- <uid>userc</uid>
- <guid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2</guid>
- <password>c</password>
- <name>c</name>
- <email-address>c@example.com</email-address>
- </user>
- <user>
- <uid>usercalonly</uid>
- <guid>9E1FFAC4-3CCD-45A1-8272-D161C92D2EEE</guid>
- <password>a</password>
- <name>a calonly</name>
- <email-address>a-calonly@example.com</email-address>
- </user>
- <user>
- <uid>useradbkonly</uid>
- <guid>7678EC8A-A069-4E82-9066-7279C6718507</guid>
- <password>a</password>
- <name>a adbkonly</name>
- <email-address>a-adbkonly@example.com</email-address>
- </user>
- <user>
- <uid>nonascii</uid>
- <uid>nonascii佐藤</uid>
- <guid>320B73A1-46E2-4180-9563-782DFDBE1F63</guid>
- <password>a</password>
- <name>佐藤佐藤佐藤</name>
- <email-address>nonascii@example.com</email-address>
- </user>
- <user>
- <uid>delegator</uid>
- <guid>FC465590-E9E9-4746-ACE8-6C756A49FE4D</guid>
- <password>a</password>
- <name>Calendar Delegator</name>
- <email-address>calendardelegator@example.com</email-address>
- </user>
- <user>
- <uid>occasionaldelegate</uid>
- <guid>EC465590-E9E9-4746-ACE8-6C756A49FE4D</guid>
- <password>a</password>
- <name>Occasional Delegate</name>
- <email-address>occasional@example.com</email-address>
- </user>
- <user>
- <uid>delegateviagroup</uid>
- <guid>46D9D716-CBEE-490F-907A-66FA6C3767FF</guid>
- <password>a</password>
- <name>Delegate Via Group</name>
- <email-address>delegateviagroup@example.com</email-address>
- </user>
- <group>
- <uid>delegategroup</uid>
- <guid>00599DAF-3E75-42DD-9DB7-52617E79943F</guid>
- <name>Delegate Group</name>
- <members>
- <member type="users">delegateviagroup</member>
- </members>
- </group>
- <user repeat="2">
- <uid>user%02d</uid>
- <guid>user%02d</guid>
- <password>%02duser</password>
- <name>~35 User %02d</name>
- <first-name>~5</first-name>
- <last-name>~9 User %02d</last-name>
- <email-address>~10@example.com</email-address>
- </user>
- <group>
- <uid>managers</uid>
- <guid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</guid>
- <password>managers</password>
- <name>Managers</name>
- <members>
- <member type="users">lecroy</member>
- </members>
- </group>
- <group>
- <uid>admin</uid>
- <guid>admin</guid>
- <password>admin</password>
- <name>Administrators</name>
- <members>
- <member type="groups">managers</member>
- </members>
- </group>
- <group>
- <uid>grunts</uid>
- <guid>grunts</guid>
- <password>grunts</password>
- <name>We do all the work</name>
- <members>
- <member>cdaboo</member>
- <member>dreid</member>
- </members>
- </group>
- <group>
- <uid>right_coast</uid>
- <guid>right_coast</guid>
- <password>right_coast</password>
- <name>East Coast</name>
- <members>
- <member>cdaboo</member>
- </members>
- </group>
- <group>
- <uid>left_coast</uid>
- <guid>left_coast</guid>
- <password>left_coast</password>
- <name>West Coast</name>
- <members>
- <member>lecroy</member>
- <member>dreid</member>
- </members>
- </group>
- <group>
- <uid>both_coasts</uid>
- <guid>both_coasts</guid>
- <password>both_coasts</password>
- <name>Both Coasts</name>
- <members>
- <member type="groups">right_coast</member>
- <member type="groups">left_coast</member>
- </members>
- </group>
- <group>
- <uid>recursive1_coasts</uid>
- <guid>recursive1_coasts</guid>
- <password>recursive1_coasts</password>
- <name>Recursive1 Coasts</name>
- <members>
- <member type="groups">recursive2_coasts</member>
- </members>
- </group>
- <group>
- <uid>recursive2_coasts</uid>
- <guid>recursive2_coasts</guid>
- <password>recursive2_coasts</password>
- <name>Recursive2 Coasts</name>
- <members>
- <member type="groups">recursive1_coasts</member>
- <member>cdaboo</member>
- </members>
- </group>
- <group>
- <uid>non_calendar_group</uid>
- <guid>non_calendar_group</guid>
- <password>non_calendar_group</password>
- <name>Non-calendar group</name>
- <members>
- <member>cdaboo</member>
- <member>lecroy</member>
- </members>
- </group>
- <location>
- <uid>mercury</uid>
- <guid>mercury</guid>
- <password>mercury</password>
- <name>Mercury Seven</name>
- <email-address>mercury@example.com</email-address>
- </location>
- <location>
- <uid>gemini</uid>
- <guid>gemini</guid>
- <password>gemini</password>
- <name>Gemini Twelve</name>
- <email-address>gemini@example.com</email-address>
- </location>
- <location>
- <uid>apollo</uid>
- <guid>apollo</guid>
- <password>apollo</password>
- <name>Apollo Eleven</name>
- <email-address>apollo@example.com</email-address>
- </location>
- <location>
- <uid>orion</uid>
- <guid>orion</guid>
- <password>orion</password>
- <name>Orion</name>
- <email-address>orion@example.com</email-address>
- </location>
- <resource>
- <uid>transporter</uid>
- <guid>transporter</guid>
- <password>transporter</password>
- <name>Mass Transporter</name>
- <email-address>transporter@example.com</email-address>
- </resource>
- <resource>
- <uid>ftlcpu</uid>
- <guid>ftlcpu</guid>
- <password>ftlcpu</password>
- <name>Faster-Than-Light Microprocessor</name>
- <email-address>ftlcpu@example.com</email-address>
- </resource>
- <resource>
- <uid>non_calendar_proxy</uid>
- <guid>non_calendar_proxy</guid>
- <password>non_calendar_proxy</password>
- <name>Non-calendar proxy</name>
- <email-address>non_calendar_proxy@example.com</email-address>
- </resource>
- <resource>
- <uid>disabled</uid>
- <guid>disabled</guid>
- <password>disabled</password>
- <name>Disabled Record</name>
- <email-address>disabled@example.com</email-address>
- </resource>
-</accounts>
</del></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytestaccountsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -17,196 +17,195 @@
</span><span class="cx"> -->
</span><span class="cx">
</span><span class="cx"> <!DOCTYPE accounts SYSTEM "../../../conf/auth/accounts.dtd">
</span><del>-
</del><span class="cx"> <directory realm="Test">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>admin</short-name>
</del><span class="cx"> <uid>D11F03A0-97EA-48AF-9A6C-FAC7F3975766</uid>
</span><ins>+ <short-name>admin</short-name>
</ins><span class="cx"> <password>nimda</password>
</span><span class="cx"> <full-name>Administrators</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>wsanchez</short-name>
</del><span class="cx"> <uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</uid>
</span><span class="cx"> <guid>6423F94A-6B76-4A3A-815B-D52CFD77935D</guid>
</span><ins>+ <short-name>wsanchez</short-name>
</ins><span class="cx"> <password>zehcnasw</password>
</span><span class="cx"> <full-name>Wilfredo Sanchez</full-name>
</span><span class="cx"> <email>wsanchez@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>cdaboo</short-name>
</del><span class="cx"> <uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
</span><span class="cx"> <guid>5A985493-EE2C-4665-94CF-4DFEA3A89500</guid>
</span><ins>+ <short-name>cdaboo</short-name>
</ins><span class="cx"> <password>oobadc</password>
</span><span class="cx"> <full-name>Cyrus Daboo</full-name>
</span><span class="cx"> <email>cdaboo@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>lecroy</short-name>
</del><span class="cx"> <uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</uid>
</span><ins>+ <short-name>lecroy</short-name>
</ins><span class="cx"> <password>yorcel</password>
</span><span class="cx"> <full-name>Chris Lecroy</full-name>
</span><span class="cx"> <email>lecroy@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>dreid</short-name>
</del><span class="cx"> <uid>5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</uid>
</span><ins>+ <short-name>dreid</short-name>
</ins><span class="cx"> <password>dierd</password>
</span><span class="cx"> <full-name>David Reid</full-name>
</span><span class="cx"> <email>dreid@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>doublequotes</short-name>
</del><span class="cx"> <uid>8E04787E-336D-41ED-A70B-D233AD0DCE6F</uid>
</span><span class="cx"> <guid>8E04787E-336D-41ED-A70B-D233AD0DCE6F</guid>
</span><ins>+ <short-name>doublequotes</short-name>
</ins><span class="cx"> <password>setouqelbuod</password>
</span><span class="cx"> <full-name>Double "quotey" Quotes</full-name>
</span><span class="cx"> <email>doublequotes@example.com</email>
</span><span class="cx"> </record>
</span><del>- <user>
- <short-name>purgeuser</short-name>
</del><ins>+ <record type="user">
</ins><span class="cx"> <uid>37DB0C90-4DB1-4932-BC69-3DAB66F374F5</uid>
</span><span class="cx"> <guid>37DB0C90-4DB1-4932-BC69-3DAB66F374F5</guid>
</span><ins>+ <short-name>purgeuser</short-name>
</ins><span class="cx"> <password>purgeuser</password>
</span><span class="cx"> <full-name>Purge User</full-name>
</span><del>- <email-address>purgeuser@example.com</email-address>
- </user>
</del><ins>+ <email>purgeuser@example.com</email>
+ </record>
</ins><span class="cx"> <record type="user">
</span><del>- <short-name>home1</short-name>
</del><span class="cx"> <uid>home1</uid>
</span><ins>+ <short-name>home1</short-name>
</ins><span class="cx"> <password>home1</password>
</span><span class="cx"> <full-name>Home One</full-name>
</span><span class="cx"> <email>home1@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>home2</short-name>
</del><span class="cx"> <uid>home2</uid>
</span><ins>+ <short-name>home2</short-name>
</ins><span class="cx"> <password>home2</password>
</span><span class="cx"> <full-name>Home Two</full-name>
</span><span class="cx"> <email>home2@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>nocalendar</short-name>
</del><span class="cx"> <uid>543D28BA-F74F-4D5F-9243-B3E3A61171E5</uid>
</span><ins>+ <short-name>nocalendar</short-name>
</ins><span class="cx"> <password>radnelacon</password>
</span><span class="cx"> <full-name>No Calendar</full-name>
</span><span class="cx"> <email>nocalendar@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>usera</short-name>
</del><span class="cx"> <uid>7423F94A-6B76-4A3A-815B-D52CFD77935D</uid>
</span><ins>+ <short-name>usera</short-name>
</ins><span class="cx"> <password>a</password>
</span><span class="cx"> <full-name>a</full-name>
</span><span class="cx"> <email>a@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>userb</short-name>
</del><span class="cx"> <uid>8A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
</span><ins>+ <short-name>userb</short-name>
</ins><span class="cx"> <password>b</password>
</span><span class="cx"> <full-name>b</full-name>
</span><span class="cx"> <email>b@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>userc</short-name>
</del><span class="cx"> <uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2</uid>
</span><ins>+ <short-name>userc</short-name>
</ins><span class="cx"> <password>c</password>
</span><span class="cx"> <full-name>c</full-name>
</span><span class="cx"> <email>c@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>usercalonly</short-name>
</del><span class="cx"> <uid>9E1FFAC4-3CCD-45A1-8272-D161C92D2EEE</uid>
</span><ins>+ <short-name>usercalonly</short-name>
</ins><span class="cx"> <password>a</password>
</span><span class="cx"> <full-name>a calonly</full-name>
</span><span class="cx"> <email>a-calonly@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>useradbkonly</short-name>
</del><span class="cx"> <uid>7678EC8A-A069-4E82-9066-7279C6718507</uid>
</span><ins>+ <short-name>useradbkonly</short-name>
</ins><span class="cx"> <password>a</password>
</span><span class="cx"> <full-name>a adbkonly</full-name>
</span><span class="cx"> <email>a-adbkonly@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><ins>+ <uid>320B73A1-46E2-4180-9563-782DFDBE1F63</uid>
</ins><span class="cx"> <short-name>nonascii</short-name>
</span><span class="cx"> <short-name>nonascii佐藤</short-name>
</span><del>- <uid>320B73A1-46E2-4180-9563-782DFDBE1F63</uid>
</del><span class="cx"> <password>a</password>
</span><span class="cx"> <full-name>佐藤佐藤佐藤</full-name>
</span><span class="cx"> <email>nonascii@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>delegator</short-name>
</del><span class="cx"> <uid>FC465590-E9E9-4746-ACE8-6C756A49FE4D</uid>
</span><ins>+ <short-name>delegator</short-name>
</ins><span class="cx"> <password>a</password>
</span><span class="cx"> <full-name>Calendar Delegator</full-name>
</span><span class="cx"> <email>calendardelegator@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><del>- <short-name>occasionaldelegate</short-name>
</del><span class="cx"> <uid>EC465590-E9E9-4746-ACE8-6C756A49FE4D</uid>
</span><ins>+ <short-name>occasionaldelegate</short-name>
</ins><span class="cx"> <password>a</password>
</span><span class="cx"> <full-name>Occasional Delegate</full-name>
</span><span class="cx"> <email>occasional@example.com</email>
</span><span class="cx"> </record>
</span><del>- <record type="user">
- <short-name>delegateviagroup</short-name>
</del><ins>+ <record type="user">
</ins><span class="cx"> <uid>46D9D716-CBEE-490F-907A-66FA6C3767FF</uid>
</span><ins>+ <short-name>delegateviagroup</short-name>
</ins><span class="cx"> <password>a</password>
</span><span class="cx"> <full-name>Delegate Via Group</full-name>
</span><span class="cx"> <email>delegateviagroup@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>delegategroup</short-name>
</del><span class="cx"> <uid>00599DAF-3E75-42DD-9DB7-52617E79943F</uid>
</span><ins>+ <short-name>delegategroup</short-name>
</ins><span class="cx"> <full-name>Delegate Group</full-name>
</span><span class="cx"> <member-uid>46D9D716-CBEE-490F-907A-66FA6C3767FF</member-uid>
</span><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user01</short-name>
</del><span class="cx"> <uid>user01</uid>
</span><ins>+ <short-name>user01</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user02</short-name>
</del><span class="cx"> <uid>user02</uid>
</span><ins>+ <short-name>user02</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user03</short-name>
</del><span class="cx"> <uid>user03</uid>
</span><ins>+ <short-name>user03</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user04</short-name>
</del><span class="cx"> <uid>user04</uid>
</span><ins>+ <short-name>user04</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user05</short-name>
</del><span class="cx"> <uid>user05</uid>
</span><ins>+ <short-name>user05</short-name>
</ins><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><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>user06</short-name>
</del><span class="cx"> <uid>user06</uid>
</span><ins>+ <short-name>user06</short-name>
</ins><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><span class="lines">@@ -216,8 +215,8 @@
</span><span class="cx"> <uid>__wsanchez1__</uid>
</span><span class="cx"> <short-name>wsanchez1</short-name>
</span><span class="cx"> <short-name>wilfredo_sanchez</short-name>
</span><del>- <full-name>Wilfredo Sanchez</full-name>
</del><span class="cx"> <password>zehcnasw</password>
</span><ins>+ <full-name>Wilfredo Sanchez</full-name>
</ins><span class="cx"> <email>wsanchez@bitbucket.calendarserver.org</email>
</span><span class="cx"> <email>wsanchez@devnull.twistedmatrix.com</email>
</span><span class="cx"> </record>
</span><span class="lines">@@ -225,8 +224,8 @@
</span><span class="cx"> <record type="user">
</span><span class="cx"> <uid>__glyph1__</uid>
</span><span class="cx"> <short-name>glyph1</short-name>
</span><del>- <full-name>Glyph Lefkowitz</full-name>
</del><span class="cx"> <password>hpylg</password>
</span><ins>+ <full-name>Glyph Lefkowitz</full-name>
</ins><span class="cx"> <email>glyph@bitbucket.calendarserver.org</email>
</span><span class="cx"> <email>glyph@devnull.twistedmatrix.com</email>
</span><span class="cx"> </record>
</span><span class="lines">@@ -235,16 +234,16 @@
</span><span class="cx"> <uid>__sagen1__</uid>
</span><span class="cx"> <short-name>sagen</short-name>
</span><span class="cx"> <short-name>sagen1</short-name>
</span><del>- <full-name>Morgen Sagen</full-name>
</del><span class="cx"> <password>negas</password>
</span><ins>+ <full-name>Morgen Sagen</full-name>
</ins><span class="cx"> <email>sagen@bitbucket.calendarserver.org</email>
</span><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="cx"> <uid>__cdaboo1__</uid>
</span><span class="cx"> <short-name>cdaboo1</short-name>
</span><del>- <full-name>Cyrus Daboo</full-name>
</del><span class="cx"> <password>suryc</password>
</span><ins>+ <full-name>Cyrus Daboo</full-name>
</ins><span class="cx"> <email>cdaboo@bitbucket.calendarserver.org</email>
</span><span class="cx"> </record>
</span><span class="cx">
</span><span class="lines">@@ -252,8 +251,8 @@
</span><span class="cx"> <uid>__dre1__</uid>
</span><span class="cx"> <short-name>dre1</short-name>
</span><span class="cx"> <short-name>dre</short-name>
</span><del>- <full-name>Andre LaBranche</full-name>
</del><span class="cx"> <password>erd</password>
</span><ins>+ <full-name>Andre LaBranche</full-name>
</ins><span class="cx"> <email>dre@bitbucket.calendarserver.org</email>
</span><span class="cx"> </record>
</span><span class="cx">
</span><span class="lines">@@ -278,22 +277,22 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> <record type="group">
</span><del>- <short-name>managers</short-name>
</del><span class="cx"> <uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</uid>
</span><ins>+ <short-name>managers</short-name>
</ins><span class="cx"> <password>managers</password>
</span><span class="cx"> <full-name>Managers</full-name>
</span><span class="cx"> <member-uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>admin</short-name>
</del><span class="cx"> <uid>admin</uid>
</span><ins>+ <short-name>admin</short-name>
</ins><span class="cx"> <password>admin</password>
</span><span class="cx"> <full-name>Administrators</full-name>
</span><span class="cx"> <member-uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>grunts</short-name>
</del><span class="cx"> <uid>grunts</uid>
</span><ins>+ <short-name>grunts</short-name>
</ins><span class="cx"> <password>grunts</password>
</span><span class="cx"> <full-name>We do all the work</full-name>
</span><span class="cx"> <member-uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</member-uid>
</span><span class="lines">@@ -301,15 +300,15 @@
</span><span class="cx"> <member-uid>5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>right_coast</short-name>
</del><span class="cx"> <uid>right_coast</uid>
</span><ins>+ <short-name>right_coast</short-name>
</ins><span class="cx"> <password>right_coast</password>
</span><span class="cx"> <full-name>East Coast</full-name>
</span><span class="cx"> <member-uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>left_coast</short-name>
</del><span class="cx"> <uid>left_coast</uid>
</span><ins>+ <short-name>left_coast</short-name>
</ins><span class="cx"> <password>left_coast</password>
</span><span class="cx"> <full-name>West Coast</full-name>
</span><span class="cx"> <member-uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</member-uid>
</span><span class="lines">@@ -317,32 +316,32 @@
</span><span class="cx"> <member-uid>5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>both_coasts</short-name>
</del><span class="cx"> <uid>both_coasts</uid>
</span><ins>+ <short-name>both_coasts</short-name>
</ins><span class="cx"> <password>both_coasts</password>
</span><span class="cx"> <full-name>Both Coasts</full-name>
</span><span class="cx"> <member-uid>right_coast</member-uid>
</span><span class="cx"> <member-uid>left_coast</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>recursive1_coasts</short-name>
</del><span class="cx"> <uid>recursive1_coasts</uid>
</span><ins>+ <short-name>recursive1_coasts</short-name>
</ins><span class="cx"> <password>recursive1_coasts</password>
</span><span class="cx"> <full-name>Recursive1 Coasts</full-name>
</span><span class="cx"> <member-uid>recursive2_coasts</member-uid>
</span><span class="cx"> <member-uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>recursive2_coasts</short-name>
</del><span class="cx"> <uid>recursive2_coasts</uid>
</span><ins>+ <short-name>recursive2_coasts</short-name>
</ins><span class="cx"> <password>recursive2_coasts</password>
</span><span class="cx"> <full-name>Recursive2 Coasts</full-name>
</span><span class="cx"> <member-uid>recursive1_coasts</member-uid>
</span><span class="cx"> <member-uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</member-uid>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><del>- <short-name>non_calendar_group</short-name>
</del><span class="cx"> <uid>non_calendar_group</uid>
</span><ins>+ <short-name>non_calendar_group</short-name>
</ins><span class="cx"> <password>non_calendar_group</password>
</span><span class="cx"> <full-name>Non-calendar group</full-name>
</span><span class="cx"> <member-uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</member-uid>
</span><span class="lines">@@ -352,36 +351,36 @@
</span><span class="cx"> <!-- Calverify test records -->
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>example1</short-name>
</del><span class="cx"> <uid>D46F3D71-04B7-43C2-A7B6-6F92F92E61D0</uid>
</span><span class="cx"> <guid>D46F3D71-04B7-43C2-A7B6-6F92F92E61D0</guid>
</span><ins>+ <short-name>example1</short-name>
</ins><span class="cx"> <password>example</password>
</span><span class="cx"> <full-name>Example User1</full-name>
</span><span class="cx"> <email>example1@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>example2</short-name>
</del><span class="cx"> <uid>47B16BB4-DB5F-4BF6-85FE-A7DA54230F92</uid>
</span><span class="cx"> <guid>47B16BB4-DB5F-4BF6-85FE-A7DA54230F92</guid>
</span><ins>+ <short-name>example2</short-name>
</ins><span class="cx"> <password>example</password>
</span><span class="cx"> <full-name>Example User2</full-name>
</span><span class="cx"> <email>example2@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>example3</short-name>
</del><span class="cx"> <uid>AC478592-7783-44D1-B2AE-52359B4E8415</uid>
</span><span class="cx"> <guid>AC478592-7783-44D1-B2AE-52359B4E8415</guid>
</span><ins>+ <short-name>example3</short-name>
</ins><span class="cx"> <password>example</password>
</span><span class="cx"> <full-name>Example User3</full-name>
</span><span class="cx"> <email>example3@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><del>- <short-name>example4</short-name>
</del><span class="cx"> <uid>A89E3A97-1658-4E45-A185-479F3E49D446</uid>
</span><span class="cx"> <guid>A89E3A97-1658-4E45-A185-479F3E49D446</guid>
</span><ins>+ <short-name>example4</short-name>
</ins><span class="cx"> <password>example</password>
</span><span class="cx"> <full-name>Example User4</full-name>
</span><span class="cx"> <email>example4@example.com</email>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytestaugmentsnormalizationxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/augments-normalization.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/augments-normalization.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/test/augments-normalization.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -21,6 +21,5 @@
</span><span class="cx"> <augments>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> </record>
</span><span class="cx"> </augments>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytestaugmentstestdefaultxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/augments-test-default.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/augments-test-default.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/test/augments-test-default.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -21,107 +21,84 @@
</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>
</span><span class="cx"> <uid>Location-Default</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><del>- <auto-schedule>true</auto-schedule>
</del><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>Location-AA*</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><del>- <auto-schedule>true</auto-schedule>
</del><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><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><del>- <auto-schedule>true</auto-schedule>
</del><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>Resource-AA*</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><del>- <auto-schedule>true</auto-schedule>
</del><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>AA*</uid>
</span><del>- <enable>true</enable>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>AB*</uid>
</span><del>- <enable>false</enable>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>B*</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>C*</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><del>- <auto-schedule>true</auto-schedule>
</del><span class="cx"> <auto-schedule-mode>accept-always</auto-schedule-mode>
</span><span class="cx"> </record>
</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"> </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"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
</span><del>- <enable>false</enable>
</del><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>false</enable-calendar>
</span><span class="cx"> <enable-addressbook>false</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"> </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"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>6A73326A-F781-47E7-A9F8-AF47364D4152</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><del>- <auto-schedule>true</auto-schedule>
</del><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>C5BAADEE-6B35-4FD5-A98A-5DF6BBAAC47A</uid>
</span><del>- <enable>true</enable>
- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><del>- <auto-schedule>true</auto-schedule>
- <auto-schedule-mode/>
</del><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>8AB34DF9-0297-4BA3-AADB-DB557DDD21E7</uid>
</span><del>- <enable>true</enable>
- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><del>- <auto-schedule>true</auto-schedule>
</del><span class="cx"> <auto-schedule-mode>accept-always</auto-schedule-mode>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytestaugmentstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/augments-test.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/augments-test.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/test/augments-test.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -21,57 +21,43 @@
</span><span class="cx"> <augments>
</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"> </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"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
</span><del>- <enable>false</enable>
</del><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>false</enable-calendar>
</span><span class="cx"> <enable-addressbook>false</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"> </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"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>6A73326A-F781-47E7-A9F8-AF47364D4152</uid>
</span><del>- <enable>true</enable>
- <hosted-at>00002</hosted-at>
- <enable>true</enable>
</del><ins>+ <server-id>00002</server-id>
</ins><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><del>- <auto-schedule>true</auto-schedule>
</del><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>C5BAADEE-6B35-4FD5-A98A-5DF6BBAAC47A</uid>
</span><del>- <enable>true</enable>
- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><del>- <auto-schedule>true</auto-schedule>
- <auto-schedule-mode/>
</del><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>8AB34DF9-0297-4BA3-AADB-DB557DDD21E7</uid>
</span><del>- <enable>true</enable>
- <enable>true</enable>
</del><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><del>- <auto-schedule>true</auto-schedule>
</del><span class="cx"> <auto-schedule-mode>accept-always</auto-schedule-mode>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytestaugmentsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/augments.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/augments.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/test/augments.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> <!DOCTYPE augments SYSTEM "../../../conf/auth/augments.dtd">
</span><span class="cx">
</span><del>-<augments realm="Test">
</del><ins>+<augments>
</ins><span class="cx"> <!--
</span><span class="cx"> <record>
</span><span class="cx"> <uid>Location-Default</uid>
</span><span class="lines">@@ -41,15 +41,15 @@
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</uid>
</span><ins>+ <server-id>00001</server-id>
</ins><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><del>- <server-id>00001</server-id>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
</span><ins>+ <server-id>00002</server-id>
</ins><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><del>- <server-id>00002</server-id>
</del><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</uid>
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> <record>
</span><span class="cx"> <uid>75EA36BE-F71B-40F9-81F9-CF59BF40CA8F</uid>
</span><span class="cx"> <enable-calendar>true</enable-calendar>
</span><del>- <auto-schedule>true</auto-schedule>
</del><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> </augments>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytestproxiesxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -16,54 +16,54 @@
</span><span class="cx"> limitations under the License.
</span><span class="cx"> -->
</span><span class="cx">
</span><del>-<!DOCTYPE proxies SYSTEM "proxies.dtd">
</del><ins>+<!DOCTYPE proxies SYSTEM "../../../conf/auth/proxies.dtd">
</ins><span class="cx">
</span><span class="cx"> <proxies>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>mercury</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>left_coast</member>
</span><del>- </proxies>
</del><ins>+ </write-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>gemini</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>6423F94A-6B76-4A3A-815B-D52CFD77935D</member>
</span><del>- </proxies>
</del><ins>+ </write-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>apollo</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>both_coasts</member>
</span><del>- </proxies>
</del><ins>+ </write-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>orion</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>recursive1_coasts</member>
</span><del>- </proxies>
</del><ins>+ </write-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>non_calendar_proxy</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>non_calendar_group</member>
</span><del>- </proxies>
- <read-only-proxies>
</del><ins>+ </write-proxies>
+ <read-proxies>
</ins><span class="cx"> <member>recursive2_coasts</member>
</span><del>- </read-only-proxies>
</del><ins>+ </read-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>7423F94A-6B76-4A3A-815B-D52CFD77935D</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>8A985493-EE2C-4665-94CF-4DFEA3A89500</member>
</span><span class="cx"> <member>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2</member>
</span><del>- </proxies>
</del><ins>+ </write-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <guid>FC465590-E9E9-4746-ACE8-6C756A49FE4D</guid>
</span><del>- <proxies>
</del><ins>+ <write-proxies>
</ins><span class="cx"> <member>EC465590-E9E9-4746-ACE8-6C756A49FE4D</member>
</span><span class="cx"> <member>00599DAF-3E75-42DD-9DB7-52617E79943F</member>
</span><del>- </proxies>
</del><ins>+ </write-proxies>
</ins><span class="cx"> </record>
</span><span class="cx"> </proxies>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytestresourcesxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/resources.xml (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/resources.xml 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/test/resources.xml 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -81,37 +81,37 @@
</span><span class="cx"> <full-name>Sanchez Office</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>location01</short-name>
</del><span class="cx"> <uid>75EA36BE-F71B-40F9-81F9-CF59BF40CA8F</uid>
</span><span class="cx"> <guid>75EA36BE-F71B-40F9-81F9-CF59BF40CA8F</guid>
</span><ins>+ <short-name>location01</short-name>
</ins><span class="cx"> <password>location01</password>
</span><span class="cx"> <full-name>Room 01</full-name>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><del>- <short-name>room-with-address-1</short-name>
</del><span class="cx"> <uid>room-addr-1</uid>
</span><span class="cx"> <guid>634A102B-6902-464F-9451-8A86A31628C1</guid>
</span><ins>+ <short-name>room-with-address-1</short-name>
</ins><span class="cx"> <password>room-addr-2</password>
</span><span class="cx"> <full-name>Room with Address 1</full-name>
</span><span class="cx"> <associated-address>1-infinite-loop</associated-address>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><ins>+ <uid>room-addr-2</uid>
</ins><span class="cx"> <short-name>room-with-address-2</short-name>
</span><del>- <uid>room-addr-2</uid>
</del><span class="cx"> <password>room-addr-2</password>
</span><span class="cx"> <full-name>Room with Address 2</full-name>
</span><span class="cx"> <associated-address>2-infinite-loop</associated-address>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="address">
</span><ins>+ <uid>1-infinite-loop</uid>
</ins><span class="cx"> <short-name>il1</short-name>
</span><del>- <uid>1-infinite-loop</uid>
</del><span class="cx"> <full-name>One Infinite Loop</full-name>
</span><span class="cx"> <street-address>1 Infinite Loop, Cupertino, CA 95014</street-address>
</span><span class="cx"> <geographic-location>37.331741,-122.030333</geographic-location>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="address">
</span><ins>+ <uid>2-infinite-loop</uid>
</ins><span class="cx"> <short-name>il2</short-name>
</span><del>- <uid>2-infinite-loop</uid>
</del><span class="cx"> <full-name>Two Infinite Loop</full-name>
</span><span class="cx"> <street-address>2 Infinite Loop, Cupertino, CA 95014</street-address>
</span><span class="cx"> <geographic-location>37.332633,-122.030502</geographic-location>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_augmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -31,46 +31,46 @@
</span><span class="cx"> xmlFileNormalization = os.path.join(os.path.dirname(__file__), "augments-normalization.xml")
</span><span class="cx">
</span><span class="cx"> testRecords = (
</span><del>- {"uid": "D11F03A0-97EA-48AF-9A6C-FAC7F3975766", "enabled": True, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "6423F94A-6B76-4A3A-815B-D52CFD77935D", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "5A985493-EE2C-4665-94CF-4DFEA3A89500", "enabled": False, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "8B4288F6-CC82-491D-8EF9-642EF4F3E7D0", "enabled": True, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1", "enabled": True, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "543D28BA-F74F-4D5F-9243-B3E3A61171E5", "enabled": True, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "6A73326A-F781-47E7-A9F8-AF47364D4152", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": True, "autoScheduleMode": "default"},
- {"uid": "C5BAADEE-6B35-4FD5-A98A-5DF6BBAAC47A", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": True, "autoScheduleMode": "default"},
- {"uid": "8AB34DF9-0297-4BA3-AADB-DB557DDD21E7", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": True, "autoScheduleMode": "accept-always"},
</del><ins>+ {"uid": "D11F03A0-97EA-48AF-9A6C-FAC7F3975766", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "default"},
+ {"uid": "6423F94A-6B76-4A3A-815B-D52CFD77935D", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "default"},
+ {"uid": "5A985493-EE2C-4665-94CF-4DFEA3A89500", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "default"},
+ {"uid": "8B4288F6-CC82-491D-8EF9-642EF4F3E7D0", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "default"},
+ {"uid": "5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "default"},
+ {"uid": "543D28BA-F74F-4D5F-9243-B3E3A61171E5", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "default"},
+ {"uid": "6A73326A-F781-47E7-A9F8-AF47364D4152", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "automatic"},
+ {"uid": "C5BAADEE-6B35-4FD5-A98A-5DF6BBAAC47A", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "automatic"},
+ {"uid": "8AB34DF9-0297-4BA3-AADB-DB557DDD21E7", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "accept-always"},
</ins><span class="cx"> {"uid": "FC674703-8008-4A77-B80E-0DB55A9CE620", "enabledForLogin": False, }, # Explicitly false
</span><span class="cx"> {"uid": "B473DC32-1B0D-45EE-9BAC-DA878AE9CE74", "enabledForLogin": True, }, # Explicitly True
</span><span class="cx"> {"uid": "9F2B176D-B3F5-483A-AA63-0A1FC6E6D54B", "enabledForLogin": True, }, # Default is True
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> testRecordWildcardDefault = (
</span><del>- {"uid": "A4318887-F2C7-4A70-9056-B88CC8DB26F1", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "AA5F935F-3358-4510-A649-B391D63279F2", "enabled": True, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "ABF1A83B-1A29-4E04-BDC3-A6A66ECF27CA", "enabled": False, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "BC22A734-5E41-4FB7-B5C1-51DC0656DC2F", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "C6DEEBB1-E14A-47F2-98BA-7E3BB4353E3A", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": True, "autoScheduleMode": "accept-always"},
- {"uid": "AA859321-2C72-4974-ADCF-0CBA0C76F95D", "enabled": True, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "AB7C488B-9ED2-4265-881C-7E2E38A63584", "enabled": False, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "BB0C0DA1-0545-45F6-8D08-917C554D93A4", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": False, "autoScheduleMode": "default"},
- {"uid": "CCD30AD3-582F-4682-8B65-2EDE92C5656E", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": True, "autoScheduleMode": "accept-always"},
</del><ins>+ {"uid": "A4318887-F2C7-4A70-9056-B88CC8DB26F1", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "default"},
+ {"uid": "AA5F935F-3358-4510-A649-B391D63279F2", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "default"},
+ {"uid": "ABF1A83B-1A29-4E04-BDC3-A6A66ECF27CA", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "default"},
+ {"uid": "BC22A734-5E41-4FB7-B5C1-51DC0656DC2F", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "default"},
+ {"uid": "C6DEEBB1-E14A-47F2-98BA-7E3BB4353E3A", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "accept-always"},
+ {"uid": "AA859321-2C72-4974-ADCF-0CBA0C76F95D", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "default"},
+ {"uid": "AB7C488B-9ED2-4265-881C-7E2E38A63584", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "default"},
+ {"uid": "BB0C0DA1-0545-45F6-8D08-917C554D93A4", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "default"},
+ {"uid": "CCD30AD3-582F-4682-8B65-2EDE92C5656E", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "accept-always"},
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> testRecordTypeDefault = (
</span><del>- ("locations", {"uid": "A4318887-F2C7-4A70-9056-B88CC8DB26F1", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": False, "autoSchedule": True, "autoScheduleMode": "default"}),
- ("locations", {"uid": "AA5F935F-3358-4510-A649-B391D63279F2", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": False, "autoSchedule": True, "autoScheduleMode": "default"}),
- ("resources", {"uid": "A5318887-F2C7-4A70-9056-B88CC8DB26F1", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": False, "autoSchedule": True, "autoScheduleMode": "default"}),
- ("resources", {"uid": "AA6F935F-3358-4510-A649-B391D63279F2", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": False, "autoSchedule": True, "autoScheduleMode": "default"}),
</del><ins>+ ("locations", {"uid": "A4318887-F2C7-4A70-9056-B88CC8DB26F1", "enabledForCalendaring": True, "enabledForAddressBooks": False, "autoScheduleMode": "automatic"}),
+ ("locations", {"uid": "AA5F935F-3358-4510-A649-B391D63279F2", "enabledForCalendaring": True, "enabledForAddressBooks": False, "autoScheduleMode": "automatic"}),
+ ("resources", {"uid": "A5318887-F2C7-4A70-9056-B88CC8DB26F1", "enabledForCalendaring": True, "enabledForAddressBooks": False, "autoScheduleMode": "automatic"}),
+ ("resources", {"uid": "AA6F935F-3358-4510-A649-B391D63279F2", "enabledForCalendaring": True, "enabledForAddressBooks": False, "autoScheduleMode": "automatic"}),
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> testAddRecords = (
</span><del>- {"uid": "D11F03A0-97EA-48AF-9A6C-FAC7F3975767", "enabled": True, "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoSchedule": False, "autoScheduleMode": "default"},
</del><ins>+ {"uid": "D11F03A0-97EA-48AF-9A6C-FAC7F3975767", "enabledForCalendaring": False, "enabledForAddressBooks": False, "autoScheduleMode": "none"},
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> testModifyRecords = (
</span><del>- {"uid": "D11F03A0-97EA-48AF-9A6C-FAC7F3975767", "enabled": True, "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoSchedule": False, "autoScheduleMode": "default"},
</del><ins>+ {"uid": "D11F03A0-97EA-48AF-9A6C-FAC7F3975767", "enabledForCalendaring": True, "enabledForAddressBooks": True, "autoScheduleMode": "none"},
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduledeliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -426,12 +426,12 @@
</span><span class="cx"> component = normalizedCalendar.mainType()
</span><span class="cx"> method = normalizedCalendar.propertyValue("METHOD")
</span><span class="cx"> self.data = str(normalizedCalendar)
</span><del>- returnValue(component, method)
</del><ins>+ returnValue((component, method,))
</ins><span class="cx"> else:
</span><span class="cx"> cal = Component.fromString(self.data)
</span><span class="cx"> component = cal.mainType()
</span><span class="cx"> method = cal.propertyValue("METHOD")
</span><del>- returnValue(component, method)
</del><ins>+ returnValue((component, method,))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduleschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -228,8 +228,28 @@
</span><span class="cx"> # For remote requests we do not allow the originator to be a local user or one within our domain.
</span><span class="cx"> originatorPrincipal = (yield self.txn.directoryService().recordWithCalendarUserAddress(self.originator))
</span><span class="cx"> localUser = (yield addressmapping.mapper.isCalendarUserInMyDomain(self.originator))
</span><ins>+
+ if (originatorPrincipal or localUser) and not self._podding:
+ log.error("Cannot use originator that is external to this server: %s" % (self.originator,))
+ raise HTTPError(self.errorResponse(
+ responsecode.FORBIDDEN,
+ self.errorElements["originator-denied"],
+ "Originator cannot be external to server",
+ ))
+
</ins><span class="cx"> if originatorPrincipal or localUser:
</span><del>- if originatorPrincipal.thisServer():
</del><ins>+
+ # iSchedule must never deliver for users hosted on the server or any pod
+ if not self._podding:
+ log.error("Cannot use originator that is local to this server: %s" % (self.originator,))
+ raise HTTPError(self.errorResponse(
+ responsecode.FORBIDDEN,
+ self.errorElements["originator-denied"],
+ "Originator cannot be external to server",
+ ))
+
+ # Cannot deliver message for someone hosted on the same pod
+ elif originatorPrincipal.thisServer():
</ins><span class="cx"> log.error("Cannot use originator that is on this server: %s" % (self.originator,))
</span><span class="cx"> raise HTTPError(self.errorResponse(
</span><span class="cx"> responsecode.FORBIDDEN,
</span><span class="lines">@@ -240,8 +260,16 @@
</span><span class="cx"> self.originator = calendarUserFromPrincipal(self.originator, originatorPrincipal)
</span><span class="cx"> self._validAlternateServer(originatorPrincipal)
</span><span class="cx"> else:
</span><del>- self.originator = RemoteCalendarUser(self.originator)
- self._validiScheduleServer()
</del><ins>+ if self._podding:
+ log.error("Cannot use originator that is external to this server: %s" % (self.originator,))
+ raise HTTPError(self.errorResponse(
+ responsecode.FORBIDDEN,
+ self.errorElements["originator-denied"],
+ "Originator cannot be external to server",
+ ))
+ else:
+ self.originator = RemoteCalendarUser(self.originator)
+ self._validiScheduleServer()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _validiScheduleServer(self):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -29,7 +29,10 @@
</span><span class="cx"> CommonCommonTests
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><span class="cx"> import txweb2.dav.test.util
</span><del>-from txdav.caldav.datastore.test.util import buildCalendarStore
</del><ins>+from txdav.caldav.datastore.test.util import buildCalendarStore, \
+ TestCalendarStoreDirectoryRecord
+from txdav.caldav.datastore.scheduling.ischedule.localservers import Servers, \
+ Server
</ins><span class="cx">
</span><span class="cx"> class iSchedulePOST (CommonCommonTests, txweb2.dav.test.util.TestCase):
</span><span class="cx">
</span><span class="lines">@@ -40,10 +43,39 @@
</span><span class="cx"> self.directory = self._sqlCalendarStore.directoryService()
</span><span class="cx">
</span><span class="cx"> self.site.resource.putChild("ischedule", IScheduleInboxResource(self.site.resource, self.storeUnderTest()))
</span><ins>+ self.site.resource.putChild("podding", IScheduleInboxResource(self.site.resource, self.storeUnderTest(), podding=True))
</ins><span class="cx">
</span><span class="cx"> yield self.populate()
</span><span class="cx">
</span><ins>+ # Pod servers
+ a_server = Server(id="A", uri="http://localhost:8008", thisServer=True)
+ Servers.addServer(a_server)
+ b_server = Server(id="B", uri="http://localhost:8108", thisServer=False)
+ Servers.addServer(b_server)
+ Servers._thisServer = a_server
</ins><span class="cx">
</span><ins>+ # Podded users
+ for ctr in range(1, 100):
+ self.directory.addRecord(TestCalendarStoreDirectoryRecord(
+ "puser{:02d}".format(ctr),
+ ("puser{:02d}".format(ctr),),
+ "Puser {:02d}".format(ctr),
+ frozenset((
+ "urn:uuid:puser{:02d}".format(ctr),
+ "mailto:puser{:02d}@example.com".format(ctr),
+ )),
+ thisServer=False,
+ server=b_server,
+ ))
+
+ # iSchedule server
+ IScheduleServers()
+ server = IScheduleServerRecord("http://127.0.0.1")
+ server.allow_from = True
+ IScheduleServers._domainMap["example.org"] = server
+ self.addCleanup(lambda : IScheduleServers._domainMap.pop("example.org")) #@UndefinedVariable
+
+
</ins><span class="cx"> def storeUnderTest(self):
</span><span class="cx"> """
</span><span class="cx"> Return a store for testing.
</span><span class="lines">@@ -132,12 +164,6 @@
</span><span class="cx"> Make calendar
</span><span class="cx"> """
</span><span class="cx">
</span><del>- IScheduleServers()
- server = IScheduleServerRecord("http://127.0.0.1")
- server.allow_from = True
- IScheduleServers._domainMap["example.org"] = server
- self.addCleanup(lambda : IScheduleServers._domainMap.pop("example.org")) #@UndefinedVariable
-
</del><span class="cx"> request = SimpleRequest(
</span><span class="cx"> self.site,
</span><span class="cx"> "POST",
</span><span class="lines">@@ -177,3 +203,246 @@
</span><span class="cx"> inbox = (yield self.calendarUnderTest(name="inbox", home="user02"))
</span><span class="cx"> count = (yield inbox.listCalendarObjects())
</span><span class="cx"> self.assertEqual(len(count), 1)
</span><ins>+
+
+ @inlineCallbacks
+ def test_receive_reject_local_originator(self):
+ """
+ Make calendar
+ """
+
+ request = SimpleRequest(
+ self.site,
+ "POST",
+ "/ischedule",
+ headers=http_headers.Headers(rawHeaders={
+ "Originator": ("mailto:user01@example.com",),
+ "Recipient": ("mailto:user02@example.com",),
+ "Content-Type": ("text/calendar",)
+ }),
+ content="""BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART:20060101T100000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:deadlocked
+ORGANIZER:mailto:user01@example.com
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:user01@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n")
+ )
+
+ response = (yield self.send(request))
+ self.assertEqual(response.code, responsecode.FORBIDDEN)
+
+ calendar = (yield self.calendarUnderTest(name="calendar_1", home="user01"))
+ count = (yield calendar.listCalendarObjects())
+ self.assertEqual(len(count), 0)
+
+ inbox = (yield self.calendarUnderTest(name="inbox", home="user01"))
+ count = (yield inbox.listCalendarObjects())
+ self.assertEqual(len(count), 0)
+
+ calendar = (yield self.calendarUnderTest(name="calendar_1", home="user02"))
+ count = (yield calendar.listCalendarObjects())
+ self.assertEqual(len(count), 0)
+
+ inbox = (yield self.calendarUnderTest(name="inbox", home="user02"))
+ count = (yield inbox.listCalendarObjects())
+ self.assertEqual(len(count), 0)
+
+
+ @inlineCallbacks
+ def test_receive_reject_podded_originator(self):
+ """
+ Make calendar
+ """
+
+ request = SimpleRequest(
+ self.site,
+ "POST",
+ "/ischedule",
+ headers=http_headers.Headers(rawHeaders={
+ "Originator": ("mailto:puser01@example.com",),
+ "Recipient": ("mailto:user02@example.com",),
+ "Content-Type": ("text/calendar",)
+ }),
+ content="""BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART:20060101T100000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:deadlocked
+ORGANIZER:mailto:puser01@example.com
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:puser01@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n")
+ )
+
+ response = (yield self.send(request))
+ self.assertEqual(response.code, responsecode.FORBIDDEN)
+
+ calendar = (yield self.calendarUnderTest(name="calendar_1", home="user02"))
+ count = (yield calendar.listCalendarObjects())
+ self.assertEqual(len(count), 0)
+
+ inbox = (yield self.calendarUnderTest(name="inbox", home="user02"))
+ count = (yield inbox.listCalendarObjects())
+ self.assertEqual(len(count), 0)
+
+
+ @inlineCallbacks
+ def test_receive_podding(self):
+ """
+ Make calendar
+ """
+
+ request = SimpleRequest(
+ self.site,
+ "POST",
+ "/podding",
+ headers=http_headers.Headers(rawHeaders={
+ "Originator": ("mailto:puser01@example.com",),
+ "Recipient": ("mailto:user02@example.com",),
+ "Content-Type": ("text/calendar",)
+ }),
+ content="""BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART:20060101T100000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:deadlocked
+ORGANIZER:mailto:puser01@example.com
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:puser01@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n")
+ )
+
+ response = (yield self.send(request))
+ self.assertEqual(response.code, responsecode.OK)
+
+ calendar = (yield self.calendarUnderTest(name="calendar_1", home="user02"))
+ count = (yield calendar.listCalendarObjects())
+ self.assertEqual(len(count), 1)
+
+ inbox = (yield self.calendarUnderTest(name="inbox", home="user02"))
+ count = (yield inbox.listCalendarObjects())
+ self.assertEqual(len(count), 1)
+
+
+ @inlineCallbacks
+ def test_receive_podding_reject_external_originator(self):
+ """
+ Make calendar
+ """
+
+ request = SimpleRequest(
+ self.site,
+ "POST",
+ "/podding",
+ headers=http_headers.Headers(rawHeaders={
+ "Originator": ("mailto:user01@example.org",),
+ "Recipient": ("mailto:user02@example.com",),
+ "Content-Type": ("text/calendar",)
+ }),
+ content="""BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART:20060101T100000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:deadlocked
+ORGANIZER:mailto:user01@example.org
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:user01@example.org
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n")
+ )
+
+ response = (yield self.send(request))
+ self.assertEqual(response.code, responsecode.FORBIDDEN)
+
+ calendar = (yield self.calendarUnderTest(name="calendar_1", home="user02"))
+ count = (yield calendar.listCalendarObjects())
+ self.assertEqual(len(count), 0)
+
+ inbox = (yield self.calendarUnderTest(name="inbox", home="user02"))
+ count = (yield inbox.listCalendarObjects())
+ self.assertEqual(len(count), 0)
+
+
+ @inlineCallbacks
+ def test_receive_podding_reject_same_pod_originator(self):
+ """
+ Make calendar
+ """
+
+ request = SimpleRequest(
+ self.site,
+ "POST",
+ "/podding",
+ headers=http_headers.Headers(rawHeaders={
+ "Originator": ("mailto:user01@example.com",),
+ "Recipient": ("mailto:user02@example.com",),
+ "Content-Type": ("text/calendar",)
+ }),
+ content="""BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART:20060101T100000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:deadlocked
+ORGANIZER:mailto:user01@example.com
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:user01@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n")
+ )
+
+ response = (yield self.send(request))
+ self.assertEqual(response.code, responsecode.FORBIDDEN)
+
+ calendar = (yield self.calendarUnderTest(name="calendar_1", home="user02"))
+ count = (yield calendar.listCalendarObjects())
+ self.assertEqual(len(count), 0)
+
+ inbox = (yield self.calendarUnderTest(name="inbox", home="user02"))
+ count = (yield inbox.listCalendarObjects())
+ self.assertEqual(len(count), 0)
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py (13374 => 13375)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/util.py 2014-04-26 15:06:12 UTC (rev 13374)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py 2014-04-26 15:10:28 UTC (rev 13375)
</span><span class="lines">@@ -150,7 +150,11 @@
</span><span class="cx"> return self._server
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def serverURI(self):
+ return self._server.uri
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> def buildDirectory(homes=None):
</span><span class="cx">
</span><span class="cx"> directory = TestStoreDirectoryService()
</span></span></pre>
</div>
</div>
</body>
</html>