<!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>[14921] 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/14921">14921</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-25 15:57:28 -0700 (Thu, 25 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add DAV header tokens for group attendee and sharee features.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavcustomxmlpy">CalendarServer/trunk/twistedcaldav/customxml.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_configpy">CalendarServer/trunk/twistedcaldav/test/test_config.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (14920 => 14921)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2015-06-25 22:56:48 UTC (rev 14920)
+++ CalendarServer/trunk/requirements-dev.txt 2015-06-25 22:57:28 UTC (rev 14921)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> q
</span><span class="cx"> tl.eggdeps
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14856#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14917#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14920#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavcustomxmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/customxml.py (14920 => 14921)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/customxml.py 2015-06-25 22:56:48 UTC (rev 14920)
+++ CalendarServer/trunk/twistedcaldav/customxml.py 2015-06-25 22:57:28 UTC (rev 14921)
</span><span class="lines">@@ -68,10 +68,18 @@
</span><span class="cx"> "calendarserver-sharing-no-scheduling",
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+calendarserver_group_sharee_compliance = (
+ "calendarserver-group-sharee",
+)
+
</ins><span class="cx"> calendarserver_partstat_changes_compliance = (
</span><span class="cx"> "calendarserver-partstat-changes",
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+calendarserver_group_attendee_compliance = (
+ "calendarserver-group-attendee",
+)
+
</ins><span class="cx"> calendarserver_home_sync_compliance = (
</span><span class="cx"> "calendarserver-home-sync",
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (14920 => 14921)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-06-25 22:56:48 UTC (rev 14920)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-06-25 22:57:28 UTC (rev 14921)
</span><span class="lines">@@ -1720,6 +1720,8 @@
</span><span class="cx"> compliance += customxml.calendarserver_sharing_compliance
</span><span class="cx"> # TODO: This is only needed whilst we do not support scheduling in shared calendars
</span><span class="cx"> compliance += customxml.calendarserver_sharing_no_scheduling_compliance
</span><ins>+ if config.Sharing.Calendars.Enabled and config.Sharing.Calendars.Groups.Enabled:
+ compliance += customxml.calendarserver_group_sharee_compliance
</ins><span class="cx"> if configDict.EnableCalendarQueryExtended:
</span><span class="cx"> compliance += caldavxml.caldav_query_extended_compliance
</span><span class="cx"> if configDict.EnableDefaultAlarms:
</span><span class="lines">@@ -1728,6 +1730,8 @@
</span><span class="cx"> compliance += caldavxml.caldav_managed_attachments_compliance
</span><span class="cx"> if configDict.Scheduling.Options.TimestampAttendeePartStatChanges:
</span><span class="cx"> compliance += customxml.calendarserver_partstat_changes_compliance
</span><ins>+ if config.GroupAttendees.Enabled:
+ compliance += customxml.calendarserver_group_attendee_compliance
</ins><span class="cx"> if configDict.EnableTimezonesByReference:
</span><span class="cx"> compliance += caldavxml.caldav_timezones_by_reference_compliance
</span><span class="cx"> compliance += customxml.calendarserver_recurrence_split
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_configpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_config.py (14920 => 14921)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_config.py 2015-06-25 22:56:48 UTC (rev 14920)
+++ CalendarServer/trunk/twistedcaldav/test/test_config.py 2015-06-25 22:57:28 UTC (rev 14921)
</span><span class="lines">@@ -384,7 +384,21 @@
</span><span class="cx"> config.EnableProxyPrincipals = False
</span><span class="cx"> self.assertTrue("calendar-proxy" not in resource.davComplianceClasses())
</span><span class="cx">
</span><ins>+ self.assertTrue("calendarserver-group-sharee" in resource.davComplianceClasses())
+ config.Sharing.Calendars.Groups.Enabled = False
+ config.update()
+ self.assertTrue("calendarserver-group-sharee" not in resource.davComplianceClasses())
+ config.Sharing.Calendars.Groups.Enabled = True
+ config.update()
</ins><span class="cx">
</span><ins>+ self.assertTrue("calendarserver-group-attendee" in resource.davComplianceClasses())
+ config.GroupAttendees.Enabled = False
+ config.update()
+ self.assertTrue("calendarserver-group-attendee" not in resource.davComplianceClasses())
+ config.GroupAttendees.Enabled = True
+ config.update()
+
+
</ins><span class="cx"> def test_logging(self):
</span><span class="cx"> """
</span><span class="cx"> Logging module configures properly.
</span></span></pre>
</div>
</div>
</body>
</html>