<!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">                 <!-- CardDAV specific extension -->
</span><span class="cx">                 <feature>carddav</feature>                                                 <!-- Basic CardDAV feature enabler -->
</span><span class="cx">                 <feature>default-addressbook</feature>                         <!-- Default address book behavior -->
</span><del>-                <!-- <feature>global-addressbook</feature> -->         <!-- Global address book for each user -->
</del><span class="cx">                 <feature>shared-addressbooks</feature>                        <!-- Shared address books extension -->
</span><span class="cx">                 <!-- <feature>directory-gateway</feature> -->        <!-- Directory gateway extension -->
</span><span class="cx">
</span><span class="lines">@@ -341,12 +340,6 @@
</span><span class="cx">                         <value>$root:directory/</value>
</span><span class="cx">                 </substitution>
</span><span class="cx">
</span><del>-                <!-- global-addressbook name -->
-                <substitution>
-                        <key>$global_addressbook:</key>
-                        <value>global-addressbook</value>
-                </substitution>
-
</del><span class="cx">                 <!-- POST add-member URI suffix -->
</span><span class="cx">                 <substitution>
</span><span class="cx">                         <key>$add-member:</key>
</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">                 <!-- CardDAV specific extension -->
</span><span class="cx">                 <feature>carddav</feature>                                                 <!-- Basic CardDAV feature enabler -->
</span><span class="cx">                 <feature>default-addressbook</feature>                         <!-- Default address book behavior -->
</span><del>-                <!-- <feature>global-addressbook</feature> -->         <!-- Global address book for each user -->
</del><span class="cx">                 <!-- <feature>shared-addressbooks</feature> --> <!-- Shared address books extension -->
</span><span class="cx">                 <!-- <feature>directory-gateway</feature> -->        <!-- Directory gateway extension -->
</span><span class="cx">
</span><span class="lines">@@ -336,12 +335,6 @@
</span><span class="cx">                         <value>$root:directory/</value>
</span><span class="cx">                 </substitution>
</span><span class="cx">
</span><del>-                <!-- global-addressbook name -->
-                <substitution>
-                        <key>$global_addressbook:</key>
-                        <value>global-addressbook</value>
-                </substitution>
-
</del><span class="cx">                 <!-- POST add-member URI suffix -->
</span><span class="cx">                 <substitution>
</span><span class="cx">                         <key>$add-member:</key>
</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">                 <!-- CardDAV specific extension -->
</span><span class="cx">                 <feature>carddav</feature>                                                 <!-- Basic CardDAV feature enabler -->
</span><span class="cx">                 <feature>default-addressbook</feature>                         <!-- Default address book behavior -->
</span><del>-                <!-- <feature>global-addressbook</feature> -->         <!-- Global address book for each user -->
</del><span class="cx">                 <feature>shared-addressbooks</feature>                        <!-- Shared address books extension -->
</span><span class="cx">                 <!-- <feature>directory-gateway</feature> -->        <!-- Directory gateway extension -->
</span><span class="cx">
</span><span class="lines">@@ -342,12 +341,6 @@
</span><span class="cx">                         <value>$root:directory/</value>
</span><span class="cx">                 </substitution>
</span><span class="cx">
</span><del>-                <!-- global-addressbook name -->
-                <substitution>
-                        <key>$global_addressbook:</key>
-                        <value>global-addressbook</value>
-                </substitution>
-
</del><span class="cx">                 <!-- POST add-member URI suffix -->
</span><span class="cx">                 <substitution>
</span><span class="cx">                         <key>$add-member:</key>
</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>-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2013 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.
- -->
-
-<caldavtest>
-        <description>Test global addressbook</description>
-        
-        <require-feature>
-                <feature>carddav</feature>
-                <feature>global-addressbook</feature>
-        </require-feature>
-
-        <start/>
-
-        <test-suite name='Resourcetype'>
-                <test name='1'>
-                        <description>PROPFIND of resourcetype</description>
-                        <request>
-                                <method>PROPFIND</method>
-                                <ruri>$addressbookhome1:/$global_addressbook:/</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>0</value>
-                                </header>
-                                <data>
-                                        <content-type>text/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
-                                </data>
-                                <verify>
-                                        <callback>propfindValues</callback>
-                                        <arg>
-                                                <name>props</name>
-                                                <value>{DAV:}resourcetype$.*shared[^-].*</value>
-                                        </arg>
-                                </verify>
-                        </request>
-                </test>
-        </test-suite>
-
-        <test-suite name='Changes by multiple users'>
-                <test name='1' ignore='no'>
-                        <description>initial query - grab token</description>
-                        <request print-response='no'>
-                                <method>REPORT</method>
-                                <ruri>$addressbookhome1:/$global_addressbook:/</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>1</value>
-                                </header>
-                                <data>
-                                        <content-type>text/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CardDAV/global-addressbook/1.xml</filepath>
-                                </data>
-                                <verify>
-                                        <callback>multistatusItems</callback>
-                                        <arg>
-                                                <name>okhrefs</name>
-                                        </arg>
-                                </verify>
-                                <grabelement>
-                                        <name>/{DAV:}multistatus/{DAV:}sync-token</name>
-                                        <variable>$synctoken1-1:</variable>
-                                </grabelement>
-                        </request>
-                </test>
-                <test name='2' ignore='no'>
-                        <description>initial query - grab token</description>
-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
-                                <method>REPORT</method>
-                                <ruri>$addressbookhome2:/$global_addressbook:/</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>1</value>
-                                </header>
-                                <data>
-                                        <content-type>text/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CardDAV/global-addressbook/1.xml</filepath>
-                                </data>
-                                <verify>
-                                        <callback>multistatusItems</callback>
-                                        <arg>
-                                                <name>okhrefs</name>
-                                        </arg>
-                                </verify>
-                                <grabelement>
-                                        <name>/{DAV:}multistatus/{DAV:}sync-token</name>
-                                        <variable>$synctoken2-1:</variable>
-                                </grabelement>
-                        </request>
-                </test>
-                <test name='3' ignore='no'>
-                        <description>new resource</description>
-                        <request end-delete="yes">
-                                <method>PUT</method>
-                                <ruri>$addressbookhome1:/$global_addressbook:/1.vcf</ruri>
-                                <data>
-                                        <content-type>text/vcard; charset=utf-8</content-type>
-                                        <filepath>Resource/CardDAV/global-addressbook/2.vcf</filepath>
-                                </data>
-                                <verify>
-                                        <callback>statusCode</callback>
-                                </verify>
-                        </request>
-                </test>
-                <test name='4' ignore='no'>
-                        <description>sync change</description>
-                        <request print-response='no'>
-                                <method>REPORT</method>
-                                <ruri>$addressbookhome1:/$global_addressbook:/</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>1</value>
-                                </header>
-                                <data substitutions='yes'>
-                                        <content-type>text/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CardDAV/global-addressbook/3.xml</filepath>
-                                </data>
-                                <verify>
-                                        <callback>multistatusItems</callback>
-                                        <arg>
-                                                <name>okhrefs</name>
-                                                <value>1.vcf</value>
-                                        </arg>
-                                </verify>
-                                <grabelement>
-                                        <name>/{DAV:}multistatus/{DAV:}sync-token</name>
-                                        <variable>$synctoken1-2:</variable>
-                                </grabelement>
-                        </request>
-                </test>
-                <test name='5' ignore='no'>
-                        <description>sync change</description>
-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
-                                <method>REPORT</method>
-                                <ruri>$addressbookhome2:/$global_addressbook:/</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>1</value>
-                                </header>
-                                <data substitutions='yes'>
-                                        <content-type>text/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CardDAV/global-addressbook/4.xml</filepath>
-                                </data>
-                                <verify>
-                                        <callback>multistatusItems</callback>
-                                        <arg>
-                                                <name>okhrefs</name>
-                                                <value>1.vcf</value>
-                                        </arg>
-                                </verify>
-                                <grabelement>
-                                        <name>/{DAV:}multistatus/{DAV:}sync-token</name>
-                                        <variable>$synctoken2-2:</variable>
-                                </grabelement>
-                        </request>
-                </test>
-                <test name='6' ignore='no'>
-                        <description>new resource #2</description>
-                        <request user="$userid2:" pswd="$pswd2:" end-delete="yes">
-                                <method>PUT</method>
-                                <ruri>$addressbookhome2:/$global_addressbook:/2.vcf</ruri>
-                                <data>
-                                        <content-type>text/vcard; charset=utf-8</content-type>
-                                        <filepath>Resource/CardDAV/global-addressbook/5.vcf</filepath>
-                                </data>
-                                <verify>
-                                        <callback>statusCode</callback>
-                                </verify>
-                        </request>
-                </test>
-                <test name='7' ignore='no'>
-                        <description>sync change</description>
-                        <request print-response='no'>
-                                <method>REPORT</method>
-                                <ruri>$addressbookhome1:/$global_addressbook:/</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>1</value>
-                                </header>
-                                <data substitutions='yes'>
-                                        <content-type>text/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CardDAV/global-addressbook/6.xml</filepath>
-                                </data>
-                                <verify>
-                                        <callback>multistatusItems</callback>
-                                        <arg>
-                                                <name>okhrefs</name>
-                                                <value>2.vcf</value>
-                                        </arg>
-                                </verify>
-                                <grabelement>
-                                        <name>/{DAV:}multistatus/{DAV:}sync-token</name>
-                                        <variable>$synctoken1-3:</variable>
-                                </grabelement>
-                        </request>
-                </test>
-                <test name='5' ignore='no'>
-                        <description>sync change</description>
-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
-                                <method>REPORT</method>
-                                <ruri>$addressbookhome2:/$global_addressbook:/</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>1</value>
-                                </header>
-                                <data substitutions='yes'>
-                                        <content-type>text/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CardDAV/global-addressbook/7.xml</filepath>
-                                </data>
-                                <verify>
-                                        <callback>multistatusItems</callback>
-                                        <arg>
-                                                <name>okhrefs</name>
-                                                <value>2.vcf</value>
-                                        </arg>
-                                </verify>
-                                <grabelement>
-                                        <name>/{DAV:}multistatus/{DAV:}sync-token</name>
-                                        <variable>$synctoken2-3:</variable>
-                                </grabelement>
-                        </request>
-                </test>
-        </test-suite>
-
-        <test-suite name='Resource-ID'>
-                <require-feature>
-                        <feature>resource-id</feature>
-                </require-feature>
-                <test name='1' ignore='no'>
-                        <description>Check property for user 1</description>
-                        <request print-response='no'>
-                                <method>PROPFIND</method>
-                                <ruri>$addressbookhome1:/$global_addressbook:/</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>0</value>
-                                </header>
-                                <data>
-                                        <content-type>text/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
-                                </data>
-                                <verify>
-                                        <callback>propfindItems</callback>
-                                        <arg>
-                                                <name>okprops</name>
-                                                <value>{DAV:}resource-id</value>
-                                        </arg>
-                                </verify>
-                                <grabproperty>
-                                        <property>{DAV:}resource-id</property>
-                                        <variable>$resourceid:</variable>
-                                </grabproperty>
-                        </request>
-                </test>
-                <test name='2' ignore='no'>
-                        <description>Check property for user 2</description>
-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
-                                <method>PROPFIND</method>
-                                <ruri>$addressbookhome2:/$global_addressbook:/</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>0</value>
-                                </header>
-                                <data>
-                                        <content-type>text/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
-                                </data>
-                                <verify>
-                                        <callback>propfindItems</callback>
-                                        <arg>
-                                                <name>okprops</name>
-                                                <value>{DAV:}resource-id$$resourceid:</value>
-                                        </arg>
-                                </verify>
-                        </request>
-                </test>
-        </test-suite>
-
-        <end/>
-        
-</caldavtest>
</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__), "principals")
</span><span class="cx"> templateName = os.path.join(testRoot, "caldavd.plist")
</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["notification"] = NotificationCollectionResource
</span><span class="cx">
</span><del>- if config.GlobalAddressBook.Enabled:
- self._provisionedLinks[config.GlobalAddressBook.Name] = "/addressbooks/public/global/addressbook/"
</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):
- """
- Global address book. All we care about is making sure permissions are setup.
- """
-
- 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"> """ 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"> "EnableSearchAddressBook": False, # /directory resource exists
</span><span class="cx"> "AnonymousDirectoryAddressBookAccess": False, # Anonymous users may access directory address book
</span><span class="cx">
</span><del>- "GlobalAddressBook": {
- "Enabled": False,
- "Name": "global-addressbook",
- "EnableAnonymousReadAccess": 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):
- """
- Wrapper around a L{txdav.carddav.iaddressbook.IAddressBook}.
- """
- pass
-
-
-
</del><span class="cx"> class AddressBookObjectResource(_CommonObjectResource):
</span><span class="cx"> """
</span><span class="cx"> A resource wrapping a addressbook object.
</span></span></pre>
</div>
</div>
</body>
</html>