<!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>[13828] 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/13828">13828</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-08-02 13:42:19 -0700 (Sat, 02 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hook up principal and data collection resources at the app layer without involving the directory service.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryaddressbookpy">CalendarServer/trunk/twistedcaldav/directory/addressbook.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorycalendarpy">CalendarServer/trunk/twistedcaldav/directory/calendar.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryprincipalpy">CalendarServer/trunk/twistedcaldav/directory/principal.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 (13827 => 13828)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2014-08-02 19:40:39 UTC (rev 13827)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2014-08-02 20:42:19 UTC (rev 13828)
</span><span class="lines">@@ -442,8 +442,6 @@
</span><span class="cx"> #
</span><span class="cx"> log.info("Setting up document root at: {root}", root=config.DocumentRoot)
</span><span class="cx">
</span><del>- # principalCollection = directory.principalCollection
-
</del><span class="cx"> if config.EnableCalDAV:
</span><span class="cx"> log.info("Setting up calendar collection: {cls}", cls=calendarResourceClass)
</span><span class="cx"> calendarCollection = calendarResourceClass(
</span><span class="lines">@@ -451,6 +449,7 @@
</span><span class="cx"> "/calendars/",
</span><span class="cx"> newStore,
</span><span class="cx"> )
</span><ins>+ principalCollection.calendarCollection = calendarCollection
</ins><span class="cx">
</span><span class="cx"> if config.EnableCardDAV:
</span><span class="cx"> log.info("Setting up address book collection: {cls}", cls=addressBookResourceClass)
</span><span class="lines">@@ -459,6 +458,7 @@
</span><span class="cx"> "/addressbooks/",
</span><span class="cx"> newStore,
</span><span class="cx"> )
</span><ins>+ principalCollection.addressBookCollection = addressBookCollection
</ins><span class="cx">
</span><span class="cx"> if config.DirectoryAddressBook.Enabled and config.EnableSearchAddressBook:
</span><span class="cx"> log.info(
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryaddressbookpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/addressbook.py (13827 => 13828)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/addressbook.py 2014-08-02 19:40:39 UTC (rev 13827)
+++ CalendarServer/trunk/twistedcaldav/directory/addressbook.py 2014-08-02 20:42:19 UTC (rev 13828)
</span><span class="lines">@@ -97,9 +97,6 @@
</span><span class="cx"> self._url = url
</span><span class="cx"> self._newStore = store
</span><span class="cx">
</span><del>- # FIXME: Smells like a hack
- directory.addressBookHomesCollection = self
-
</del><span class="cx"> #
</span><span class="cx"> # Create children
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorycalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py (13827 => 13828)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2014-08-02 19:40:39 UTC (rev 13827)
+++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2014-08-02 20:42:19 UTC (rev 13828)
</span><span class="lines">@@ -98,9 +98,6 @@
</span><span class="cx"> self._url = url
</span><span class="cx"> self._newStore = store
</span><span class="cx">
</span><del>- # FIXME: Smells like a hack
- directory.calendarHomesCollection = self
-
</del><span class="cx"> #
</span><span class="cx"> # Create children
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryprincipalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py (13827 => 13828)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2014-08-02 19:40:39 UTC (rev 13827)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2014-08-02 20:42:19 UTC (rev 13828)
</span><span class="lines">@@ -286,6 +286,10 @@
</span><span class="cx"> # FIXME: Smells like a hack
</span><span class="cx"> self.directory.setPrincipalCollection(self)
</span><span class="cx">
</span><ins>+ # Used to hook in the data collection root resources
+ self.calendarCollection = None
+ self.addressBookCollection = None
+
</ins><span class="cx"> #
</span><span class="cx"> # Create children
</span><span class="cx"> #
</span><span class="lines">@@ -1349,10 +1353,10 @@
</span><span class="cx">
</span><span class="cx"> def _homeChildURL(self, name):
</span><span class="cx"> if not hasattr(self, "calendarHomeURL"):
</span><del>- if not hasattr(self.record.service, "calendarHomesCollection"):
</del><ins>+ if self.parent.parent.calendarCollection is None:
</ins><span class="cx"> return None
</span><span class="cx"> self.calendarHomeURL = joinURL(
</span><del>- self.record.service.calendarHomesCollection.url(),
</del><ins>+ self.parent.parent.calendarCollection.url(),
</ins><span class="cx"> uidsResourceName,
</span><span class="cx"> self.record.uid
</span><span class="cx"> ) + "/"
</span><span class="lines">@@ -1369,20 +1373,18 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def calendarHome(self, request):
</span><del>- # FIXME: self.record.service.calendarHomesCollection smells like a hack
- service = self.record.service
- if hasattr(service, "calendarHomesCollection"):
- return service.calendarHomesCollection.homeForDirectoryRecord(self.record, request)
</del><ins>+ if self.parent.parent.calendarCollection is not None:
+ return self.parent.parent.calendarCollection.homeForDirectoryRecord(self.record, request)
</ins><span class="cx"> else:
</span><span class="cx"> return succeed(None)
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _addressBookHomeChildURL(self, name):
</span><span class="cx"> if not hasattr(self, "addressBookHomeURL"):
</span><del>- if not hasattr(self.record.service, "addressBookHomesCollection"):
</del><ins>+ if self.parent.parent.addressBookCollection is None:
</ins><span class="cx"> return None
</span><span class="cx"> self.addressBookHomeURL = joinURL(
</span><del>- self.record.service.addressBookHomesCollection.url(),
</del><ins>+ self.parent.parent.addressBookCollection.url(),
</ins><span class="cx"> uidsResourceName,
</span><span class="cx"> self.record.uid
</span><span class="cx"> ) + "/"
</span><span class="lines">@@ -1399,10 +1401,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def addressBookHome(self, request):
</span><del>- # FIXME: self.record.service.addressBookHomesCollection smells like a hack
- service = self.record.service
- if hasattr(service, "addressBookHomesCollection"):
- return service.addressBookHomesCollection.homeForDirectoryRecord(self.record, request)
</del><ins>+ if self.parent.parent.addressBookCollection is not None:
+ return self.parent.parent.addressBookCollection.homeForDirectoryRecord(self.record, request)
</ins><span class="cx"> else:
</span><span class="cx"> return succeed(None)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>