<!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>[12420] 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/12420">12420</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 10:54:20 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Kill InternalDirectoryService</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryinternalpy">CalendarServer/trunk/twistedcaldav/directory/internal.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (12419 => 12420)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2014-01-22 18:11:52 UTC (rev 12419)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2014-01-22 18:54:20 UTC (rev 12420)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> from twistedcaldav.directory.calendar import DirectoryCalendarHomeProvisioningResource
</span><span class="cx"> from twistedcaldav.directory.digest import QopDigestCredentialFactory
</span><span class="cx"> from twistedcaldav.directory.directory import GroupMembershipCache
</span><del>-from twistedcaldav.directory.internal import InternalDirectoryService
</del><span class="cx"> from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource
</span><span class="cx"> from twistedcaldav.directory.wiki import WikiDirectoryService
</span><span class="cx"> from calendarserver.push.notifier import NotifierFactory
</span><span class="lines">@@ -355,14 +354,6 @@
</span><span class="cx"> wikiDirectory.realmName = baseDirectory.realmName
</span><span class="cx"> directories.append(wikiDirectory)
</span><span class="cx">
</span><del>- #
- # Add internal directory service
- # Right now we only use this for CardDAV
- #
- if config.EnableCardDAV:
- internalDirectory = InternalDirectoryService(baseDirectory.realmName)
- directories.append(internalDirectory)
-
</del><span class="cx"> directory = AggregateDirectoryService(directories, groupMembershipCache)
</span><span class="cx">
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryinternalpy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/twistedcaldav/directory/internal.py (12419 => 12420)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/internal.py 2014-01-22 18:11:52 UTC (rev 12419)
+++ CalendarServer/trunk/twistedcaldav/directory/internal.py 2014-01-22 18:54:20 UTC (rev 12420)
</span><span class="lines">@@ -1,133 +0,0 @@
</span><del>-##
-# Copyright (c) 2010-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.
-##
-
-"""
-Directory service implementation for internal purposes - e.g. public
-calendars, addressbooks, directory gateway, global address book.
-"""
-
-__all__ = [
- "InternalDirectoryService",
-]
-
-from txweb2.dav.auth import IPrincipalCredentials
-
-from twisted.cred.error import UnauthorizedLogin
-
-from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
-from twistedcaldav.directory.directory import UnknownRecordTypeError
-
-class InternalDirectoryService(DirectoryService):
- """
- L{IDirectoryService} implementation for internal record types.
- """
- baseGUID = "80DED344-B79F-46AF-B05B-E35D737BC19A"
-
- realmName = None
-
- plistFile = None
-
- supportedRecordTypes = ("public",)
-
- def __repr__(self):
- return "<%s %r>" % (self.__class__.__name__, self.realmName)
-
-
- def __init__(self, realm):
- super(InternalDirectoryService, self).__init__()
-
- self.realmName = realm
- self._records()
-
-
- def _records(self):
- """
- Build the list of records.
-
- Right now we want public/global and public/directory for
- global and directory address books.
- """
-
- if not hasattr(self, "_cachedRecords"):
- self._cachedRecords = (
- InternalDirectoryRecord(
- self,
- "public",
- "4F00E8BA-7B45-42E9-B9D1-F499B6A2E887",
- "global",
- False,
- True
- ),
- InternalDirectoryRecord(
- self,
- "public",
- "1BC554CC-DBD6-4454-8423-2637A9B681DC",
- "directory",
- False,
- True
- ),
- )
- return self._cachedRecords
-
-
- def recordTypes(self):
- return InternalDirectoryService.supportedRecordTypes
-
-
- def listRecords(self, recordType):
- if recordType not in InternalDirectoryService.supportedRecordTypes:
- raise UnknownRecordTypeError(recordType)
-
- return self._records()
-
-
- def recordWithShortName(self, recordType, shortName):
- if recordType not in InternalDirectoryService.supportedRecordTypes:
- raise UnknownRecordTypeError(recordType)
-
- for record in self._records():
- if shortName in record.shortNames:
- return record
-
-
- def requestAvatarId(self, credentials):
- credentials = IPrincipalCredentials(credentials)
- raise UnauthorizedLogin("No such user: %s" % (credentials.credentials.username,))
-
-
-
-class InternalDirectoryRecord(DirectoryRecord):
- """
- L{DirectoryRecord} implementation for internal records.
- """
-
- def __init__(self, service, recordType, guid, shortName,
- enabledForCalendaring=None, enabledForAddressBooks=None,):
- super(InternalDirectoryRecord, self).__init__(
- service=service,
- recordType=recordType,
- guid=guid,
- shortNames=(shortName,),
- fullName=shortName,
- enabledForCalendaring=enabledForCalendaring,
- enabledForAddressBooks=enabledForAddressBooks,
- )
-
- self.enabled = True # Explicitly enabled
-
-
- def verifyCredentials(self, credentials):
- return False
</del></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (12419 => 12420)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2014-01-22 18:11:52 UTC (rev 12419)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2014-01-22 18:54:20 UTC (rev 12420)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> from twistedcaldav.datafilters.hiddeninstance import HiddenInstanceFilter
</span><span class="cx"> from twistedcaldav.datafilters.peruserdata import PerUserDataFilter
</span><span class="cx"> from twistedcaldav.datafilters.privateevents import PrivateEventFilter
</span><del>-from twistedcaldav.directory.internal import InternalDirectoryRecord
</del><span class="cx"> from twistedcaldav.extensions import DAVResource, DAVPrincipalResource, \
</span><span class="cx"> DAVResourceWithChildrenMixin
</span><span class="cx"> from twistedcaldav import ical
</span><span class="lines">@@ -2817,13 +2816,8 @@
</span><span class="cx"> # Check for public/global path
</span><span class="cx"> from twistedcaldav.storebridge import (
</span><span class="cx"> AddressBookCollectionResource,
</span><del>- GlobalAddressBookCollectionResource,
</del><span class="cx"> )
</span><span class="cx"> mainCls = AddressBookCollectionResource
</span><del>- if isinstance(self.record, InternalDirectoryRecord):
- if "global" in self.record.shortNames:
- mainCls = GlobalAddressBookCollectionResource
-
</del><span class="cx"> newAddressBook = yield self._newStoreHome.addressbookWithName(name)
</span><span class="cx"> if newAddressBook and not newAddressBook.owned() and not self.canShare():
</span><span class="cx"> newAddressBook = None
</span></span></pre>
</div>
</div>
</body>
</html>