<!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>[12423] CalendarServer/trunk/twistedcaldav</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/12423">12423</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 13:37:31 -0800 (Wed, 22 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove unused GlobalAddressBook and related code</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfopodxml">CalDAVTester/trunk/scripts/server/serverinfo-pod.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfotemplatexml">CalDAVTester/trunk/scripts/server/serverinfo-template.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfoxml">CalDAVTester/trunk/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_principalspy">CalendarServer/trunk/calendarserver/tools/test/test_principals.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVglobaladdressbookxml">CalDAVTester/trunk/scripts/tests/CardDAV/global-addressbook.xml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptsserverserverinfopodxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml (12422 => 12423)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml        2014-01-22 20:29:15 UTC (rev 12422)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml        2014-01-22 21:37:31 UTC (rev 12423)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx">                 &lt;!-- CardDAV specific extension --&gt;
</span><span class="cx">                 &lt;feature&gt;carddav&lt;/feature&gt;                                                 &lt;!-- Basic CardDAV feature enabler --&gt;
</span><span class="cx">                 &lt;feature&gt;default-addressbook&lt;/feature&gt;                         &lt;!-- Default address book behavior --&gt;
</span><del>-                &lt;!-- &lt;feature&gt;global-addressbook&lt;/feature&gt; --&gt;         &lt;!-- Global address book for each user --&gt;
</del><span class="cx">                 &lt;feature&gt;shared-addressbooks&lt;/feature&gt;                        &lt;!-- Shared address books extension --&gt;
</span><span class="cx">                 &lt;!-- &lt;feature&gt;directory-gateway&lt;/feature&gt; --&gt;        &lt;!-- Directory gateway extension --&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -341,12 +340,6 @@
</span><span class="cx">                         &lt;value&gt;$root:directory/&lt;/value&gt;
</span><span class="cx">                 &lt;/substitution&gt;
</span><span class="cx"> 
</span><del>-                &lt;!-- global-addressbook name --&gt;
-                &lt;substitution&gt;
-                        &lt;key&gt;$global_addressbook:&lt;/key&gt;
-                        &lt;value&gt;global-addressbook&lt;/value&gt;
-                &lt;/substitution&gt;
-
</del><span class="cx">                 &lt;!-- POST add-member URI suffix --&gt;
</span><span class="cx">                 &lt;substitution&gt;
</span><span class="cx">                         &lt;key&gt;$add-member:&lt;/key&gt;
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfotemplatexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml (12422 => 12423)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml        2014-01-22 20:29:15 UTC (rev 12422)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml        2014-01-22 21:37:31 UTC (rev 12423)
</span><span class="lines">@@ -105,7 +105,6 @@
</span><span class="cx">                 &lt;!-- CardDAV specific extension --&gt;
</span><span class="cx">                 &lt;feature&gt;carddav&lt;/feature&gt;                                                 &lt;!-- Basic CardDAV feature enabler --&gt;
</span><span class="cx">                 &lt;feature&gt;default-addressbook&lt;/feature&gt;                         &lt;!-- Default address book behavior --&gt;
</span><del>-                &lt;!-- &lt;feature&gt;global-addressbook&lt;/feature&gt; --&gt;         &lt;!-- Global address book for each user --&gt;
</del><span class="cx">                 &lt;!-- &lt;feature&gt;shared-addressbooks&lt;/feature&gt; --&gt; &lt;!-- Shared address books extension --&gt;
</span><span class="cx">                 &lt;!-- &lt;feature&gt;directory-gateway&lt;/feature&gt; --&gt;        &lt;!-- Directory gateway extension --&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -336,12 +335,6 @@
</span><span class="cx">                         &lt;value&gt;$root:directory/&lt;/value&gt;
</span><span class="cx">                 &lt;/substitution&gt;
</span><span class="cx"> 
</span><del>-                &lt;!-- global-addressbook name --&gt;
-                &lt;substitution&gt;
-                        &lt;key&gt;$global_addressbook:&lt;/key&gt;
-                        &lt;value&gt;global-addressbook&lt;/value&gt;
-                &lt;/substitution&gt;
-
</del><span class="cx">                 &lt;!-- POST add-member URI suffix --&gt;
</span><span class="cx">                 &lt;substitution&gt;
</span><span class="cx">                         &lt;key&gt;$add-member:&lt;/key&gt;
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml (12422 => 12423)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.xml        2014-01-22 20:29:15 UTC (rev 12422)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml        2014-01-22 21:37:31 UTC (rev 12423)
</span><span class="lines">@@ -105,7 +105,6 @@
</span><span class="cx">                 &lt;!-- CardDAV specific extension --&gt;
</span><span class="cx">                 &lt;feature&gt;carddav&lt;/feature&gt;                                                 &lt;!-- Basic CardDAV feature enabler --&gt;
</span><span class="cx">                 &lt;feature&gt;default-addressbook&lt;/feature&gt;                         &lt;!-- Default address book behavior --&gt;
</span><del>-                &lt;!-- &lt;feature&gt;global-addressbook&lt;/feature&gt; --&gt;         &lt;!-- Global address book for each user --&gt;
</del><span class="cx">                 &lt;feature&gt;shared-addressbooks&lt;/feature&gt;                        &lt;!-- Shared address books extension --&gt;
</span><span class="cx">                 &lt;!-- &lt;feature&gt;directory-gateway&lt;/feature&gt; --&gt;        &lt;!-- Directory gateway extension --&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -342,12 +341,6 @@
</span><span class="cx">                         &lt;value&gt;$root:directory/&lt;/value&gt;
</span><span class="cx">                 &lt;/substitution&gt;
</span><span class="cx"> 
</span><del>-                &lt;!-- global-addressbook name --&gt;
-                &lt;substitution&gt;
-                        &lt;key&gt;$global_addressbook:&lt;/key&gt;
-                        &lt;value&gt;global-addressbook&lt;/value&gt;
-                &lt;/substitution&gt;
-
</del><span class="cx">                 &lt;!-- POST add-member URI suffix --&gt;
</span><span class="cx">                 &lt;substitution&gt;
</span><span class="cx">                         &lt;key&gt;$add-member:&lt;/key&gt;
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVglobaladdressbookxml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/scripts/tests/CardDAV/global-addressbook.xml (12422 => 12423)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/global-addressbook.xml        2014-01-22 20:29:15 UTC (rev 12422)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/global-addressbook.xml        2014-01-22 21:37:31 UTC (rev 12423)
</span><span class="lines">@@ -1,297 +0,0 @@
</span><del>-&lt;?xml version=&quot;1.0&quot; standalone=&quot;no&quot;?&gt;
-
-&lt;!DOCTYPE caldavtest SYSTEM &quot;caldavtest.dtd&quot;&gt;
-
-&lt;!--
- Copyright (c) 2006-2013 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
- 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 &quot;AS IS&quot; 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.
- --&gt;
-
-&lt;caldavtest&gt;
-        &lt;description&gt;Test global addressbook&lt;/description&gt;
-        
-        &lt;require-feature&gt;
-                &lt;feature&gt;carddav&lt;/feature&gt;
-                &lt;feature&gt;global-addressbook&lt;/feature&gt;
-        &lt;/require-feature&gt;
-
-        &lt;start/&gt;
-
-        &lt;test-suite name='Resourcetype'&gt;
-                &lt;test name='1'&gt;
-                        &lt;description&gt;PROPFIND of resourcetype&lt;/description&gt;
-                        &lt;request&gt;
-                                &lt;method&gt;PROPFIND&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome1:/$global_addressbook:/&lt;/ruri&gt;
-                                &lt;header&gt;
-                                        &lt;name&gt;Depth&lt;/name&gt;
-                                        &lt;value&gt;0&lt;/value&gt;
-                                &lt;/header&gt;
-                                &lt;data&gt;
-                                        &lt;content-type&gt;text/xml; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/Common/PROPFIND/resourcetype.xml&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;propfindValues&lt;/callback&gt;
-                                        &lt;arg&gt;
-                                                &lt;name&gt;props&lt;/name&gt;
-                                                &lt;value&gt;{DAV:}resourcetype$.*shared[^-].*&lt;/value&gt;
-                                        &lt;/arg&gt;
-                                &lt;/verify&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-        &lt;/test-suite&gt;
-
-        &lt;test-suite name='Changes by multiple users'&gt;
-                &lt;test name='1' ignore='no'&gt;
-                        &lt;description&gt;initial query - grab token&lt;/description&gt;
-                        &lt;request print-response='no'&gt;
-                                &lt;method&gt;REPORT&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome1:/$global_addressbook:/&lt;/ruri&gt;
-                                &lt;header&gt;
-                                        &lt;name&gt;Depth&lt;/name&gt;
-                                        &lt;value&gt;1&lt;/value&gt;
-                                &lt;/header&gt;
-                                &lt;data&gt;
-                                        &lt;content-type&gt;text/xml; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/CardDAV/global-addressbook/1.xml&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;multistatusItems&lt;/callback&gt;
-                                        &lt;arg&gt;
-                                                &lt;name&gt;okhrefs&lt;/name&gt;
-                                        &lt;/arg&gt;
-                                &lt;/verify&gt;
-                                &lt;grabelement&gt;
-                                        &lt;name&gt;/{DAV:}multistatus/{DAV:}sync-token&lt;/name&gt;
-                                        &lt;variable&gt;$synctoken1-1:&lt;/variable&gt;
-                                &lt;/grabelement&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-                &lt;test name='2' ignore='no'&gt;
-                        &lt;description&gt;initial query - grab token&lt;/description&gt;
-                        &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot; print-response='no'&gt;
-                                &lt;method&gt;REPORT&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome2:/$global_addressbook:/&lt;/ruri&gt;
-                                &lt;header&gt;
-                                        &lt;name&gt;Depth&lt;/name&gt;
-                                        &lt;value&gt;1&lt;/value&gt;
-                                &lt;/header&gt;
-                                &lt;data&gt;
-                                        &lt;content-type&gt;text/xml; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/CardDAV/global-addressbook/1.xml&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;multistatusItems&lt;/callback&gt;
-                                        &lt;arg&gt;
-                                                &lt;name&gt;okhrefs&lt;/name&gt;
-                                        &lt;/arg&gt;
-                                &lt;/verify&gt;
-                                &lt;grabelement&gt;
-                                        &lt;name&gt;/{DAV:}multistatus/{DAV:}sync-token&lt;/name&gt;
-                                        &lt;variable&gt;$synctoken2-1:&lt;/variable&gt;
-                                &lt;/grabelement&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-                &lt;test name='3' ignore='no'&gt;
-                        &lt;description&gt;new resource&lt;/description&gt;
-                        &lt;request end-delete=&quot;yes&quot;&gt;
-                                &lt;method&gt;PUT&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome1:/$global_addressbook:/1.vcf&lt;/ruri&gt;
-                                &lt;data&gt;
-                                        &lt;content-type&gt;text/vcard; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/CardDAV/global-addressbook/2.vcf&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;statusCode&lt;/callback&gt;
-                                &lt;/verify&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-                &lt;test name='4' ignore='no'&gt;
-                        &lt;description&gt;sync change&lt;/description&gt;
-                        &lt;request print-response='no'&gt;
-                                &lt;method&gt;REPORT&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome1:/$global_addressbook:/&lt;/ruri&gt;
-                                &lt;header&gt;
-                                        &lt;name&gt;Depth&lt;/name&gt;
-                                        &lt;value&gt;1&lt;/value&gt;
-                                &lt;/header&gt;
-                                &lt;data substitutions='yes'&gt;
-                                        &lt;content-type&gt;text/xml; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/CardDAV/global-addressbook/3.xml&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;multistatusItems&lt;/callback&gt;
-                                        &lt;arg&gt;
-                                                &lt;name&gt;okhrefs&lt;/name&gt;
-                                                &lt;value&gt;1.vcf&lt;/value&gt;
-                                        &lt;/arg&gt;
-                                &lt;/verify&gt;
-                                &lt;grabelement&gt;
-                                        &lt;name&gt;/{DAV:}multistatus/{DAV:}sync-token&lt;/name&gt;
-                                        &lt;variable&gt;$synctoken1-2:&lt;/variable&gt;
-                                &lt;/grabelement&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-                &lt;test name='5' ignore='no'&gt;
-                        &lt;description&gt;sync change&lt;/description&gt;
-                        &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot; print-response='no'&gt;
-                                &lt;method&gt;REPORT&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome2:/$global_addressbook:/&lt;/ruri&gt;
-                                &lt;header&gt;
-                                        &lt;name&gt;Depth&lt;/name&gt;
-                                        &lt;value&gt;1&lt;/value&gt;
-                                &lt;/header&gt;
-                                &lt;data substitutions='yes'&gt;
-                                        &lt;content-type&gt;text/xml; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/CardDAV/global-addressbook/4.xml&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;multistatusItems&lt;/callback&gt;
-                                        &lt;arg&gt;
-                                                &lt;name&gt;okhrefs&lt;/name&gt;
-                                                &lt;value&gt;1.vcf&lt;/value&gt;
-                                        &lt;/arg&gt;
-                                &lt;/verify&gt;
-                                &lt;grabelement&gt;
-                                        &lt;name&gt;/{DAV:}multistatus/{DAV:}sync-token&lt;/name&gt;
-                                        &lt;variable&gt;$synctoken2-2:&lt;/variable&gt;
-                                &lt;/grabelement&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-                &lt;test name='6' ignore='no'&gt;
-                        &lt;description&gt;new resource #2&lt;/description&gt;
-                        &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot; end-delete=&quot;yes&quot;&gt;
-                                &lt;method&gt;PUT&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome2:/$global_addressbook:/2.vcf&lt;/ruri&gt;
-                                &lt;data&gt;
-                                        &lt;content-type&gt;text/vcard; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/CardDAV/global-addressbook/5.vcf&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;statusCode&lt;/callback&gt;
-                                &lt;/verify&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-                &lt;test name='7' ignore='no'&gt;
-                        &lt;description&gt;sync change&lt;/description&gt;
-                        &lt;request print-response='no'&gt;
-                                &lt;method&gt;REPORT&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome1:/$global_addressbook:/&lt;/ruri&gt;
-                                &lt;header&gt;
-                                        &lt;name&gt;Depth&lt;/name&gt;
-                                        &lt;value&gt;1&lt;/value&gt;
-                                &lt;/header&gt;
-                                &lt;data substitutions='yes'&gt;
-                                        &lt;content-type&gt;text/xml; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/CardDAV/global-addressbook/6.xml&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;multistatusItems&lt;/callback&gt;
-                                        &lt;arg&gt;
-                                                &lt;name&gt;okhrefs&lt;/name&gt;
-                                                &lt;value&gt;2.vcf&lt;/value&gt;
-                                        &lt;/arg&gt;
-                                &lt;/verify&gt;
-                                &lt;grabelement&gt;
-                                        &lt;name&gt;/{DAV:}multistatus/{DAV:}sync-token&lt;/name&gt;
-                                        &lt;variable&gt;$synctoken1-3:&lt;/variable&gt;
-                                &lt;/grabelement&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-                &lt;test name='5' ignore='no'&gt;
-                        &lt;description&gt;sync change&lt;/description&gt;
-                        &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot; print-response='no'&gt;
-                                &lt;method&gt;REPORT&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome2:/$global_addressbook:/&lt;/ruri&gt;
-                                &lt;header&gt;
-                                        &lt;name&gt;Depth&lt;/name&gt;
-                                        &lt;value&gt;1&lt;/value&gt;
-                                &lt;/header&gt;
-                                &lt;data substitutions='yes'&gt;
-                                        &lt;content-type&gt;text/xml; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/CardDAV/global-addressbook/7.xml&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;multistatusItems&lt;/callback&gt;
-                                        &lt;arg&gt;
-                                                &lt;name&gt;okhrefs&lt;/name&gt;
-                                                &lt;value&gt;2.vcf&lt;/value&gt;
-                                        &lt;/arg&gt;
-                                &lt;/verify&gt;
-                                &lt;grabelement&gt;
-                                        &lt;name&gt;/{DAV:}multistatus/{DAV:}sync-token&lt;/name&gt;
-                                        &lt;variable&gt;$synctoken2-3:&lt;/variable&gt;
-                                &lt;/grabelement&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-        &lt;/test-suite&gt;
-
-        &lt;test-suite name='Resource-ID'&gt;
-                &lt;require-feature&gt;
-                        &lt;feature&gt;resource-id&lt;/feature&gt;
-                &lt;/require-feature&gt;
-                &lt;test name='1' ignore='no'&gt;
-                        &lt;description&gt;Check property for user 1&lt;/description&gt;
-                        &lt;request print-response='no'&gt;
-                                &lt;method&gt;PROPFIND&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome1:/$global_addressbook:/&lt;/ruri&gt;
-                                &lt;header&gt;
-                                        &lt;name&gt;Depth&lt;/name&gt;
-                                        &lt;value&gt;0&lt;/value&gt;
-                                &lt;/header&gt;
-                                &lt;data&gt;
-                                        &lt;content-type&gt;text/xml; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/Common/PROPFIND/resourceid.xml&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;propfindItems&lt;/callback&gt;
-                                        &lt;arg&gt;
-                                                &lt;name&gt;okprops&lt;/name&gt;
-                                                &lt;value&gt;{DAV:}resource-id&lt;/value&gt;
-                                        &lt;/arg&gt;
-                                &lt;/verify&gt;
-                                &lt;grabproperty&gt;
-                                        &lt;property&gt;{DAV:}resource-id&lt;/property&gt;
-                                        &lt;variable&gt;$resourceid:&lt;/variable&gt;
-                                &lt;/grabproperty&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-                &lt;test name='2' ignore='no'&gt;
-                        &lt;description&gt;Check property for user 2&lt;/description&gt;
-                        &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot; print-response='no'&gt;
-                                &lt;method&gt;PROPFIND&lt;/method&gt;
-                                &lt;ruri&gt;$addressbookhome2:/$global_addressbook:/&lt;/ruri&gt;
-                                &lt;header&gt;
-                                        &lt;name&gt;Depth&lt;/name&gt;
-                                        &lt;value&gt;0&lt;/value&gt;
-                                &lt;/header&gt;
-                                &lt;data&gt;
-                                        &lt;content-type&gt;text/xml; charset=utf-8&lt;/content-type&gt;
-                                        &lt;filepath&gt;Resource/Common/PROPFIND/resourceid.xml&lt;/filepath&gt;
-                                &lt;/data&gt;
-                                &lt;verify&gt;
-                                        &lt;callback&gt;propfindItems&lt;/callback&gt;
-                                        &lt;arg&gt;
-                                                &lt;name&gt;okprops&lt;/name&gt;
-                                                &lt;value&gt;{DAV:}resource-id$$resourceid:&lt;/value&gt;
-                                        &lt;/arg&gt;
-                                &lt;/verify&gt;
-                        &lt;/request&gt;
-                &lt;/test&gt;
-        &lt;/test-suite&gt;
-
-        &lt;end/&gt;
-        
-&lt;/caldavtest&gt;
</del></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_principalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_principals.py (12422 => 12423)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_principals.py        2014-01-22 20:29:15 UTC (rev 12422)
+++ CalendarServer/trunk/calendarserver/tools/test/test_principals.py        2014-01-22 21:37:31 UTC (rev 12423)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx">         # Since this test operates on proxy db, we need to assign the service:
</span><span class="cx">         calendaruserproxy.ProxyDBService = calendaruserproxy.ProxySqliteDB(os.path.abspath(self.mktemp()))
</span><span class="cx"> 
</span><del>-        config.GlobalAddressBook.Enabled = False
-
</del><span class="cx">         testRoot = os.path.join(os.path.dirname(__file__), &quot;principals&quot;)
</span><span class="cx">         templateName = os.path.join(testRoot, &quot;caldavd.plist&quot;)
</span><span class="cx">         templateFile = open(templateName)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (12422 => 12423)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py        2014-01-22 20:29:15 UTC (rev 12422)
+++ CalendarServer/trunk/twistedcaldav/resource.py        2014-01-22 21:37:31 UTC (rev 12423)
</span><span class="lines">@@ -2793,10 +2793,7 @@
</span><span class="cx">             from twistedcaldav.notifications import NotificationCollectionResource
</span><span class="cx">             self._provisionedChildren[&quot;notification&quot;] = NotificationCollectionResource
</span><span class="cx"> 
</span><del>-        if config.GlobalAddressBook.Enabled:
-            self._provisionedLinks[config.GlobalAddressBook.Name] = &quot;/addressbooks/public/global/addressbook/&quot;
</del><span class="cx"> 
</span><del>-
</del><span class="cx">     def makeNewStore(self):
</span><span class="cx">         return self._associatedTransaction.addressbookHomeWithUID(self.name, create=True), False     # Don't care about created
</span><span class="cx"> 
</span><span class="lines">@@ -2908,50 +2905,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-class GlobalAddressBookResource (ReadOnlyResourceMixIn, CalDAVResource):
-    &quot;&quot;&quot;
-    Global address book. All we care about is making sure permissions are setup.
-    &quot;&quot;&quot;
-
-    def resourceType(self):
-        return element.ResourceType.sharedaddressbook #@UndefinedVariable
-
-
-    def defaultAccessControlList(self):
-
-        aces = (
-            element.ACE(
-                element.Principal(element.Authenticated()),
-                element.Grant(
-                    element.Privilege(element.Read()),
-                    element.Privilege(element.ReadCurrentUserPrivilegeSet()),
-                    element.Privilege(element.Write()),
-                ),
-                element.Protected(),
-                TwistedACLInheritable(),
-           ),
-        )
-
-        if config.GlobalAddressBook.EnableAnonymousReadAccess:
-            aces += (
-                element.ACE(
-                    element.Principal(element.Unauthenticated()),
-                    element.Grant(
-                        element.Privilege(element.Read()),
-                    ),
-                    element.Protected(),
-                    TwistedACLInheritable(),
-               ),
-            )
-        return element.ACL(*aces)
-
-
-    def accessControlList(self, request, inheritance=True, expanding=False, inherited_aces=None):
-        # Permissions here are fixed, and are not subject to inheritance rules, etc.
-        return succeed(self.defaultAccessControlList())
-
-
-
</del><span class="cx"> class AuthenticationWrapper(SuperAuthenticationWrapper):
</span><span class="cx"> 
</span><span class="cx">     &quot;&quot;&quot; AuthenticationWrapper implementation which allows overriding
</span><span class="lines">@@ -2983,7 +2936,6 @@
</span><span class="cx">         req.credentialFactories = factories
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> ##
</span><span class="cx"> # Utilities
</span><span class="cx"> ##
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (12422 => 12423)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py        2014-01-22 20:29:15 UTC (rev 12422)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py        2014-01-22 21:37:31 UTC (rev 12423)
</span><span class="lines">@@ -646,12 +646,6 @@
</span><span class="cx">     &quot;EnableSearchAddressBook&quot;: False, # /directory resource exists
</span><span class="cx">     &quot;AnonymousDirectoryAddressBookAccess&quot;: False, # Anonymous users may access directory address book
</span><span class="cx"> 
</span><del>-    &quot;GlobalAddressBook&quot;: {
-        &quot;Enabled&quot;: False,
-        &quot;Name&quot;: &quot;global-addressbook&quot;,
-        &quot;EnableAnonymousReadAccess&quot;: False,
-    },
-
</del><span class="cx">     # /XXX CardDAV
</span><span class="cx"> 
</span><span class="cx">     #
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (12422 => 12423)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py        2014-01-22 20:29:15 UTC (rev 12422)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py        2014-01-22 21:37:31 UTC (rev 12423)
</span><span class="lines">@@ -52,8 +52,7 @@
</span><span class="cx">     TooManyInstancesError
</span><span class="cx"> from twistedcaldav.memcachelock import MemcacheLockTimeoutError
</span><span class="cx"> from twistedcaldav.notifications import NotificationCollectionResource, NotificationResource
</span><del>-from twistedcaldav.resource import CalDAVResource, GlobalAddressBookResource, \
-    DefaultAlarmPropertyMixin
</del><ins>+from twistedcaldav.resource import CalDAVResource, DefaultAlarmPropertyMixin
</ins><span class="cx"> from twistedcaldav.scheduling_store.caldav.resource import ScheduleInboxResource
</span><span class="cx"> from twistedcaldav.sharing import invitationBindStatusToXMLMap, \
</span><span class="cx">     invitationBindModeToXMLMap
</span><span class="lines">@@ -3424,14 +3423,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-class GlobalAddressBookCollectionResource(GlobalAddressBookResource, AddressBookCollectionResource):
-    &quot;&quot;&quot;
-    Wrapper around a L{txdav.carddav.iaddressbook.IAddressBook}.
-    &quot;&quot;&quot;
-    pass
-
-
-
</del><span class="cx"> class AddressBookObjectResource(_CommonObjectResource):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     A resource wrapping a addressbook object.
</span></span></pre>
</div>
</div>

</body>
</html>