<!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>[13740] 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/13740">13740</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 12:36:55 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Shared all-day events default to transparent.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdbinspectpy">CalendarServer/trunk/calendarserver/tools/dbinspect.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdatafiltersperuserdatapy">CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdatafilterstesttest_peruserdatapy">CalendarServer/trunk/twistedcaldav/datafilters/test/test_peruserdata.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodgetpy">CalendarServer/trunk/twistedcaldav/method/get.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_calendar_querypy">CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_commonpy">CalendarServer/trunk/twistedcaldav/method/report_common.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3184A661ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3184A66-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3184D261ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3184D26-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31853261ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185326-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31854DA1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31854DA-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31856AC1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31856AC-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318585A1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318585A-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3185A141ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185A14-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3185BBD1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185BBD-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3185D631ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185D63-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3185F201ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185F20-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31860C81ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31860C8-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318627C1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318627C-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31864261ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186426-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31865E41ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31865E4-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31867921ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186792-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31869381ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186938-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3186ADE1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186ADE-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3186C961ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186C96-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3186E3A1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186E3A-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3186FE71ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186FE7-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318719A1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318719A-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31873431ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3187343-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31889061ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188906-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3188B3A1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188B3A-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3188CFF1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188CFF-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3188EAA1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188EAA-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31890581ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189058-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31892031ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189203-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31893C21ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31893C2-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31895721ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189572-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31897161ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189716-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC31898D41ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31898D4-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3189A881ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189A88-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3189C321ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189C32-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3189DEC1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189DEC-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC3189F941ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189F94-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318A1481ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A148-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318A2F31ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A2F3-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318A4BA1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A4BA-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318A6E11ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A6E1-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318A8981ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A898-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318AA541ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318AA54-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318ABFE1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318ABFE-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318ADAA1ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318ADAA-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318AF531ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318AF53-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318B1081ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318B108-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestdataHolidaysC318B2D21ED011D9A5E0000A958A3252ics">CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318B2D2-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_icalendarpy">CalendarServer/trunk/twistedcaldav/test/test_icalendar.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_multigetpy">CalendarServer/trunk/twistedcaldav/test/test_multiget.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingfreebusypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdbinspectpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dbinspect.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dbinspect.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/calendarserver/tools/dbinspect.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> from twistedcaldav.config import config
</span><del>-from twistedcaldav.datafilters.peruserdata import PerUserDataFilter
</del><span class="cx"> from twistedcaldav.directory import calendaruserproxy
</span><span class="cx"> from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
</span><span class="cx">
</span><span class="lines">@@ -98,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def UserNameFromUID(txn, uid):
</span><del>- record = yield txn.directoryService().recordWithGUID(uid)
</del><ins>+ record = yield txn.directoryService().recordWithUID(uid)
</ins><span class="cx"> returnValue(record.shortNames[0] if record else "(%s)" % (uid,))
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -116,7 +115,7 @@
</span><span class="cx"> record = yield txn.directoryService().recordWithShortName(CalRecordType.resource, value)
</span><span class="cx"> if record is None:
</span><span class="cx"> record = yield txn.directoryService().recordWithShortName(RecordType.group, value)
</span><del>- returnValue(record.guid if record else None)
</del><ins>+ returnValue(record.uid if record else None)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -772,8 +771,7 @@
</span><span class="cx"> returnValue(None)
</span><span class="cx"> for name, _ignore_uid, _ignore_type in matches:
</span><span class="cx"> event = yield calendar.calendarObjectWithName(name)
</span><del>- ical_data = yield event.component()
- ical_data = PerUserDataFilter(uid).filter(ical_data)
</del><ins>+ ical_data = yield event.componentForUser()
</ins><span class="cx"> ical_data.stripStandardTimezones()
</span><span class="cx">
</span><span class="cx"> table = tables.Table()
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdatafiltersperuserdatapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -109,45 +109,15 @@
</span><span class="cx">
</span><span class="cx"> # Now transfer any components over
</span><span class="cx"> if peruser_component:
</span><del>- self._mergeBack(ical, peruser_component)
</del><ins>+ self._filterBack(ical, peruser_component)
+ else:
+ self._defaultFilter(ical)
</ins><span class="cx">
</span><span class="cx"> return ical
</span><span class="cx">
</span><span class="cx">
</span><del>- def merge(self, icalnew, icalold):
</del><ins>+ def _filterBack(self, ical, peruser):
</ins><span class="cx"> """
</span><del>- Merge the new data with the old taking per-user information into account.
-
- @param icalnew: new calendar data
- @type icalnew: L{Component} or C{str}
- @param icalold: existing calendar data
- @type icalold: L{Component} or C{str}
-
- @return: L{Component} for the merged calendar data
- """
-
- # Make sure input is valid
- icalnew = self.validCalendar(icalnew)
-
- # There cannot be any X-CALENDARSERVER-PERUSER components in the new data
- for component in tuple(icalnew.subcomponents()):
- if component.name() == PERUSER_COMPONENT:
- raise ValueError("Cannot merge calendar data with X-CALENDARSERVER-PERUSER components in it")
-
- # First split the new data into common and per-user pieces
- self._splitPerUserData(icalnew)
- if icalold is None:
- return icalnew
-
- # Make sure input is valid
- icalold = self.validCalendar(icalold)
-
- self._mergeRepresentations(icalnew, icalold)
- return icalnew
-
-
- def _mergeBack(self, ical, peruser):
- """
</del><span class="cx"> Merge the per-user data back into the main calendar data.
</span><span class="cx">
</span><span class="cx"> @param ical: main calendar data to merge into
</span><span class="lines">@@ -179,7 +149,7 @@
</span><span class="cx"> if ical_component is None:
</span><span class="cx"> continue
</span><span class="cx"> peruser_component = peruser_recurrence_map[rid]
</span><del>- self._mergeBackComponent(ical_component, peruser_component)
</del><ins>+ self._filterBackComponent(ical_component, peruser_component)
</ins><span class="cx"> ical.addComponent(ical_component)
</span><span class="cx"> elif peruser_only_set:
</span><span class="cx"> # We used to error out here, but instead we should silently ignore this error and keep going
</span><span class="lines">@@ -189,7 +159,7 @@
</span><span class="cx"> for rid in union_set:
</span><span class="cx"> ical_component = ical.overriddenComponent(rid)
</span><span class="cx"> peruser_component = peruser_recurrence_map[rid]
</span><del>- self._mergeBackComponent(ical_component, peruser_component)
</del><ins>+ self._filterBackComponent(ical_component, peruser_component)
</ins><span class="cx">
</span><span class="cx"> # For ones in main data but no per-user data, we try and copy over the master per-user data
</span><span class="cx"> if ical_only_set:
</span><span class="lines">@@ -197,16 +167,17 @@
</span><span class="cx"> if peruser_master:
</span><span class="cx"> for rid in ical_only_set:
</span><span class="cx"> ical_component = ical.overriddenComponent(rid)
</span><del>- self._mergeBackComponent(ical_component, peruser_master)
</del><ins>+ self._filterBackComponent(ical_component, peruser_master)
</ins><span class="cx">
</span><span class="cx">
</span><del>- def _mergeBackComponent(self, ical, peruser):
</del><ins>+ def _filterBackComponent(self, ical, peruser):
</ins><span class="cx"> """
</span><span class="cx"> Copy all properties and sub-components from per-user data into the main component
</span><del>- @param ical:
- @type ical:
- @param peruser:
- @type peruser:
</del><ins>+
+ @param ical: main calendar component data to merge into
+ @type ical: L{Component}
+ @param peruser: the per-user data to merge in
+ @type peruser: L{Component}
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # Each sub-component
</span><span class="lines">@@ -220,6 +191,52 @@
</span><span class="cx"> ical.addProperty(property)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def _defaultFilter(self, ical):
+ """
+ There is no per-user component. Instead apply default properties to the data for this user.
+
+ @param ical: the iCalendar object to process
+ @type ical: L{Component}
+ """
+
+ # TRANSP property behavior: if the event is all-day add TRANSP:TRANSPARENT, otherwise do nothing
+ comp = ical.mainComponent()
+ if comp.name() == "VEVENT" and comp.propertyValue("DTSTART").isDateOnly() and not comp.hasProperty("TRANSP"):
+ ical.addPropertyToAllComponents(Property("TRANSP", "TRANSPARENT"))
+
+
+ def merge(self, icalnew, icalold):
+ """
+ Merge the new data with the old taking per-user information into account.
+
+ @param icalnew: new calendar data
+ @type icalnew: L{Component} or C{str}
+ @param icalold: existing calendar data
+ @type icalold: L{Component} or C{str}
+
+ @return: L{Component} for the merged calendar data
+ """
+
+ # Make sure input is valid
+ icalnew = self.validCalendar(icalnew)
+
+ # There cannot be any X-CALENDARSERVER-PERUSER components in the new data
+ for component in tuple(icalnew.subcomponents()):
+ if component.name() == PERUSER_COMPONENT:
+ raise ValueError("Cannot merge calendar data with X-CALENDARSERVER-PERUSER components in it")
+
+ # First split the new data into common and per-user pieces
+ self._splitPerUserData(icalnew)
+ if icalold is None:
+ return icalnew
+
+ # Make sure input is valid
+ icalold = self.validCalendar(icalold)
+
+ self._mergeRepresentations(icalnew, icalold)
+ return icalnew
+
+
</ins><span class="cx"> def _splitPerUserData(self, ical):
</span><span class="cx"> """
</span><span class="cx"> Split the per-user data out of the "normal" iCalendar components into separate per-user
</span><span class="lines">@@ -249,6 +266,9 @@
</span><span class="cx"> perinstance_component = Component(PERINSTANCE_COMPONENT) if self.uid else None
</span><span class="cx"> perinstance_id_different = False
</span><span class="cx">
</span><ins>+ # Special case certain default property values
+ self._defaultMerge(component)
+
</ins><span class="cx"> # Transfer per-user properties from main component to per-instance component
</span><span class="cx"> for property in tuple(component.properties()):
</span><span class="cx"> if property.name() in PerUserDataFilter.PERUSER_PROPERTIES or property.name().startswith("X-") and property.name() not in PerUserDataFilter.IGNORE_X_PROPERTIES:
</span><span class="lines">@@ -316,6 +336,21 @@
</span><span class="cx"> ical.removeComponent(subcomponent)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def _defaultMerge(self, component):
+ """
+ Handle default property values during a merge.
+
+ @param component: the iCalendar component to process
+ @type component: L{Component}
+ """
+
+ # Special handling for TRANSP: if it is not present on an all-day event,
+ # add TRANSP:OPAQUE so that the default is explicitly included, since otherwise
+ # L_defaultFilter) will add TRANSP:TRANSPARENT
+ if component.name() == "VEVENT" and component.propertyValue("DTSTART").isDateOnly() and not component.hasProperty("TRANSP"):
+ component.addProperty(Property("TRANSP", "OPAQUE"))
+
+
</ins><span class="cx"> def _mergeRepresentations(self, icalnew, icalold):
</span><span class="cx">
</span><span class="cx"> # Test for simple case first
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdatafilterstesttest_peruserdatapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/datafilters/test/test_peruserdata.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/datafilters/test/test_peruserdata.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/datafilters/test/test_peruserdata.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -6707,3 +6707,582 @@
</span><span class="cx"> result02 = PerUserDataFilter("user02").filter(peruser.duplicate())
</span><span class="cx"> self.assertEqual(str(result02), data02)
</span><span class="cx"> TimezoneCache.clear()
</span><ins>+
+
+
+class PerUserDataFilterTestTransp (twistedcaldav.test.util.TestCase):
+
+ def test_filter(self):
+
+ data = (
+ (
+ "Event timed, no per-user",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:VEVENT
+UID:12345-67890
+RECURRENCE-ID:20080602T120000Z
+DTSTART:20080602T130000Z
+DTEND:20080602T140000Z
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+END:VEVENT
+END:VCALENDAR
+""",
+ None,
+ None,
+ ),
+ (
+ "Event all-day, no per-user",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:VEVENT
+UID:12345-67890
+RECURRENCE-ID:20080602
+DTSTART;VALUE=DATE:20080602
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+UID:12345-67890
+RECURRENCE-ID;VALUE=DATE:20080602
+DTSTART;VALUE=DATE:20080602
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+UID:12345-67890
+RECURRENCE-ID;VALUE=DATE:20080602
+DTSTART;VALUE=DATE:20080602
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+""",
+ ),
+ (
+ "Event timed, per-user user01 no transp",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user01
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+X-FOO:BAR
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+X-FOO:BAR
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
+""",
+ ),
+ (
+ "Event all-day, per-user user01 no transp",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user01
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+X-FOO:BAR
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+X-FOO:BAR
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+""",
+ ),
+ (
+ "Event timed, per-user user01 with transp",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user01
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+X-FOO:BAR
+TRANSP:TRANSPARENT
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+TRANSP:TRANSPARENT
+X-FOO:BAR
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
+""",
+ ),
+ (
+ "Event all-day, per-user user01 with transp",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user01
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+X-FOO:BAR
+TRANSP:OPAQUE
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+TRANSP:OPAQUE
+X-FOO:BAR
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+""",
+ ),
+ )
+
+ for title, txt, result1, result2 in data:
+ txt = txt.replace("\n", "\r\n")
+ self.assertEqual(str(PerUserDataFilter("user01").filter(txt)), result1.replace("\n", "\r\n") if result1 is not None else txt, msg=title)
+ self.assertEqual(str(PerUserDataFilter("user02").filter(txt)), result2.replace("\n", "\r\n") if result2 is not None else txt, msg=title)
+
+
+ def test_merge(self):
+
+ data = (
+ (
+ "Event timed, no-existing per-user",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
+""",
+ "user01",
+ None,
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
+""",
+
+ ),
+ (
+ "Event all-day, no existing per-user",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
+""",
+ "user01",
+ None,
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user01
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+TRANSP:OPAQUE
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+END:VCALENDAR
+""",
+
+ ),
+ (
+ "Event timed, existing per-user",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
+""",
+ "user02",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user01
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+TRANSP:TRANSPARENT
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user01
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+TRANSP:TRANSPARENT
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+END:VCALENDAR
+""",
+ ),
+ (
+ "Event all-day, existing per-user",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
+""",
+ "user02",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user01
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+TRANSP:OPAQUE
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.com
+DTSTAMP:20080601T120000Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user02
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+TRANSP:OPAQUE
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+BEGIN:X-CALENDARSERVER-PERUSER
+UID:12345-67890
+X-CALENDARSERVER-PERUSER-UID:user01
+BEGIN:X-CALENDARSERVER-PERINSTANCE
+TRANSP:OPAQUE
+END:X-CALENDARSERVER-PERINSTANCE
+END:X-CALENDARSERVER-PERUSER
+END:VCALENDAR
+""",
+
+ ),
+ )
+
+ for title, txt, user, before, after in data:
+ txt = txt.replace("\n", "\r\n")
+ self.assertEqual(str(PerUserDataFilter(user).merge(txt, before)), after.replace("\n", "\r\n"), msg=title)
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -3525,6 +3525,18 @@
</span><span class="cx"> return changed
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def adjustedTransp(self):
+ """
+ Determine the TRANSP value for this component. Note that for all-day VEVENTs
+ we are going to treat the default as TRANSPARENT and not OPAQUE
+ """
+ transp = self.propertyValue("TRANSP")
+ if transp is None and self.name() == "VEVENT" and self.propertyValue("DTSTART").isDateOnly():
+ return "TRANSPARENT"
+ else:
+ return "OPAQUE" if transp is None else transp
+
+
</ins><span class="cx"> def allPerUserUIDs(self):
</span><span class="cx">
</span><span class="cx"> results = set()
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodgetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/get.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/get.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/method/get.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> if accepted_type is None:
</span><span class="cx"> raise HTTPError(StatusResponse(responsecode.NOT_ACCEPTABLE, "Cannot generate requested data type"))
</span><span class="cx">
</span><del>- caldata = (yield self.iCalendarForUser(request))
</del><ins>+ caldata = (yield self.iCalendarForUser())
</ins><span class="cx">
</span><span class="cx"> # Filter any attendee hidden instances
</span><span class="cx"> caldata = HiddenInstanceFilter().filter(caldata)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_calendar_querypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> child_uri_name = child_uri[child_uri.rfind("/") + 1:]
</span><span class="cx">
</span><span class="cx"> if generate_calendar_data or not index_query_ok:
</span><del>- calendar = (yield child.iCalendarForUser(request))
</del><ins>+ calendar = (yield child.iCalendarForUser())
</ins><span class="cx"> assert calendar is not None, "Calendar %s is missing from calendar collection %r" % (child_uri_name, self)
</span><span class="cx"> else:
</span><span class="cx"> calendar = None
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> # Check private events access status
</span><span class="cx"> isowner = (yield calresource.isOwner(request))
</span><span class="cx">
</span><del>- calendar = (yield calresource.iCalendarForUser(request))
</del><ins>+ calendar = (yield calresource.iCalendarForUser())
</ins><span class="cx"> yield queryCalendarObjectResource(calresource, uri, None, calendar, timezone)
</span><span class="cx">
</span><span class="cx"> returnValue(True)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_common.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> if isinstance(property, caldavxml.CalendarData):
</span><span class="cx"> # Handle private events access restrictions
</span><span class="cx"> if calendar is None:
</span><del>- calendar = (yield resource.iCalendarForUser(request))
</del><ins>+ calendar = (yield resource.iCalendarForUser())
</ins><span class="cx"> filtered = HiddenInstanceFilter().filter(calendar)
</span><span class="cx"> filtered = PrivateEventFilter(resource.accessMode, isowner).filter(filtered)
</span><span class="cx"> filtered = CalendarDataFilter(property, timezone).filter(filtered)
</span><span class="lines">@@ -669,12 +669,12 @@
</span><span class="cx"> # Add extended details
</span><span class="cx"> if do_event_details:
</span><span class="cx"> child = (yield request.locateChildResource(calresource, name))
</span><del>- calendar = (yield child.iCalendarForUser(request))
</del><ins>+ calendar = (yield child.iCalendarForUser())
</ins><span class="cx"> _addEventDetails(calendar, event_details, rich_options, timerange, tzinfo)
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> child = (yield request.locateChildResource(calresource, name))
</span><del>- calendar = (yield child.iCalendarForUser(request))
</del><ins>+ calendar = (yield child.iCalendarForUser())
</ins><span class="cx">
</span><span class="cx"> # The calendar may come back as None if the resource is being changed, or was deleted
</span><span class="cx"> # between our initial index query and getting here. For now we will ignore this error, but in
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx"> # Add extended details
</span><span class="cx"> if calendar.mainType() == "VEVENT" and do_event_details:
</span><span class="cx"> child = (yield request.locateChildResource(calresource, name))
</span><del>- calendar = (yield child.iCalendarForUser(request))
</del><ins>+ calendar = (yield child.iCalendarForUser())
</ins><span class="cx"> _addEventDetails(calendar, event_details, rich_options, timerange, tzinfo)
</span><span class="cx">
</span><span class="cx"> returnValue(matchtotal)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.customxml import calendarserver_namespace
</span><span class="cx"> from twistedcaldav.datafilters.hiddeninstance import HiddenInstanceFilter
</span><del>-from twistedcaldav.datafilters.peruserdata import PerUserDataFilter
</del><span class="cx"> from twistedcaldav.datafilters.privateevents import PrivateEventFilter
</span><span class="cx"> from twistedcaldav.extensions import DAVResource, DAVPrincipalResource, \
</span><span class="cx"> DAVResourceWithChildrenMixin
</span><span class="lines">@@ -1059,20 +1058,6 @@
</span><span class="cx"> return self._newStoreParentHome.isDefaultCalendar(self._newStoreObject)
</span><span class="cx">
</span><span class="cx">
</span><del>- @inlineCallbacks
- def iCalendarForUser(self, request):
-
- caldata = yield self.iCalendar()
-
- accessUID = (yield self.resourceOwnerPrincipal(request))
- if accessUID is None:
- accessUID = ""
- else:
- accessUID = accessUID.principalUID()
-
- returnValue(PerUserDataFilter(accessUID).filter(caldata))
-
-
</del><span class="cx"> def iCalendarAddressDoNormalization(self, ical):
</span><span class="cx"> """
</span><span class="cx"> Normalize calendar user addresses in the supplied iCalendar object into their
</span><span class="lines">@@ -1476,12 +1461,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def iCalendarFiltered(self, isowner, accessUID=None):
</del><ins>+ def iCalendarFiltered(self, isowner):
</ins><span class="cx">
</span><span class="cx"> # Now "filter" the resource calendar data
</span><del>- caldata = (yield self.iCalendar())
- if accessUID:
- caldata = PerUserDataFilter(accessUID).filter(caldata)
</del><ins>+ caldata = (yield self.iCalendarForUser())
</ins><span class="cx"> caldata = HiddenInstanceFilter().filter(caldata)
</span><span class="cx"> caldata = PrivateEventFilter(self.accessMode, isowner).filter(caldata)
</span><span class="cx"> returnValue(caldata)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -1136,7 +1136,6 @@
</span><span class="cx">
</span><span class="cx"> tzids = set()
</span><span class="cx"> isowner = (yield self.isOwner(request))
</span><del>- accessPrincipal = (yield self.resourceOwnerPrincipal(request))
</del><span class="cx">
</span><span class="cx"> for name in (yield self._newStoreObject.listObjectResources()):
</span><span class="cx"> try:
</span><span class="lines">@@ -1153,7 +1152,7 @@
</span><span class="cx">
</span><span class="cx"> # Get the access filtered view of the data
</span><span class="cx"> try:
</span><del>- subcalendar = yield child.iCalendarFiltered(isowner, accessPrincipal.principalUID() if accessPrincipal else "")
</del><ins>+ subcalendar = yield child.iCalendarFiltered(isowner)
</ins><span class="cx"> except ValueError:
</span><span class="cx"> continue
</span><span class="cx"> assert subcalendar.name() == "VCALENDAR"
</span><span class="lines">@@ -2675,6 +2674,7 @@
</span><span class="cx"> def componentForUser(self):
</span><span class="cx"> return self._newStoreObject.componentForUser()
</span><span class="cx">
</span><ins>+ iCalendarForUser = componentForUser
</ins><span class="cx">
</span><span class="cx"> def validIfScheduleMatch(self, request):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3184A661ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3184A66-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3184A66-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3184A66-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020102
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20031231;BYMONTH=1
</span><span class="cx"> SUMMARY:New Year's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3184D261ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3184D26-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3184D26-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3184D26-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020122
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20040118;BYMONTH=1;BYDAY=3MO
</span><span class="cx"> SUMMARY:Martin Luther King's Birthday (observed)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31853261ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185326-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185326-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185326-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020213
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=2
</span><span class="cx"> SUMMARY:Lincoln's Birthday
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31854DA1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31854DA-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31854DA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31854DA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020215
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=2
</span><span class="cx"> SUMMARY:Valentine's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31856AC1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31856AC-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31856AC-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31856AC-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020219
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20040215;BYMONTH=2;BYDAY=3MO
</span><span class="cx"> SUMMARY:President's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318585A1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318585A-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318585A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318585A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020223
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20040221;BYMONTH=2
</span><span class="cx"> SUMMARY:Washington's Birthday
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3185A141ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185A14-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185A14-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185A14-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020318
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=3
</span><span class="cx"> SUMMARY:St. Patrick's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3185BBD1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185BBD-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185BBD-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185BBD-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -8,5 +8,6 @@
</span><span class="cx"> DTSTART;VALUE=DATE:20020331
</span><span class="cx"> DTEND;VALUE=DATE:20020401
</span><span class="cx"> SUMMARY:Easter
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3185D631ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185D63-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185D63-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185D63-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020416
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=4
</span><span class="cx"> SUMMARY:Tax Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3185F201ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185F20-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185F20-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3185F20-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020513
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=5;BYDAY=2SU
</span><span class="cx"> SUMMARY:Mother's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31860C81ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31860C8-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31860C8-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31860C8-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020528
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20040530;BYMONTH=5;BYDAY=-1MO
</span><span class="cx"> SUMMARY:Memorial Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318627C1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318627C-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318627C-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318627C-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020530
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=5
</span><span class="cx"> SUMMARY:John F. Kennedy's Birthday
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31864261ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186426-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186426-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186426-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020617
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=6;BYDAY=3SU
</span><span class="cx"> SUMMARY:Father's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31865E41ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31865E4-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31865E4-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31865E4-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020705
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20040703;BYMONTH=7
</span><span class="cx"> SUMMARY:Independence Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31867921ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186792-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186792-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186792-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020903
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20040905;BYMONTH=9;BYDAY=1MO
</span><span class="cx"> SUMMARY:Labor Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31869381ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186938-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186938-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186938-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20021015
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20041010;BYMONTH=10;BYDAY=2MO
</span><span class="cx"> SUMMARY:Columbus Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3186ADE1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186ADE-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186ADE-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186ADE-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20021028
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=10;BYDAY=-1SU
</span><span class="cx"> SUMMARY:Daylight Saving Time Ends
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3186C961ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186C96-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186C96-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186C96-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20021101
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=10
</span><span class="cx"> SUMMARY:Halloween
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3186E3A1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186E3A-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186E3A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186E3A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20021112
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20041110;BYMONTH=11
</span><span class="cx"> SUMMARY:Veteran's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3186FE71ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186FE7-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186FE7-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3186FE7-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20021129
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20041124;BYMONTH=11;BYDAY=4TH
</span><span class="cx"> SUMMARY:Thanksgiving
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318719A1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318719A-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318719A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318719A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20021226
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20041224;BYMONTH=12
</span><span class="cx"> SUMMARY:Christmas Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31873431ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3187343-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3187343-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3187343-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -8,5 +8,6 @@
</span><span class="cx"> DTSTART;VALUE=DATE:20030420
</span><span class="cx"> DTEND;VALUE=DATE:20030421
</span><span class="cx"> SUMMARY:Easter
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31889061ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188906-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188906-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188906-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20020408
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=4;BYDAY=1SU
</span><span class="cx"> SUMMARY:Daylight Saving Time Begins
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3188B3A1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188B3A-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188B3A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188B3A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10,5 +10,6 @@
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=2
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> SUMMARY:Groundhog Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3188CFF1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188CFF-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188CFF-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188CFF-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DURATION:P1D
</span><span class="cx"> SEQUENCE:2
</span><span class="cx"> SUMMARY:April Fool's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3188EAA1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188EAA-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188EAA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3188EAA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10,5 +10,6 @@
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20040502;BYMONTH=5;BYDAY=1MO
</span><span class="cx"> SEQUENCE:5
</span><span class="cx"> SUMMARY:May Day Bank Holiday
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31890581ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189058-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189058-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189058-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10,5 +10,6 @@
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=5
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> SUMMARY:Cinco de Mayo
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31892031ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189203-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189203-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189203-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10,5 +10,6 @@
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=6
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> SUMMARY:Flag Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31893C21ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31893C2-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31893C2-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31893C2-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20050328
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> SUMMARY:Easter
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31895721ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189572-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189572-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189572-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10,5 +10,6 @@
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> SUMMARY:April Fool's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31897161ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189716-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189716-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189716-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20040102
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=1
</span><span class="cx"> SUMMARY:New Year's Day\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC31898D41ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31898D4-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31898D4-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C31898D4-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20040120
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=1;BYDAY=3MO
</span><span class="cx"> SUMMARY:Martin Luther King's Birthday observed\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3189A881ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189A88-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189A88-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189A88-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20040217
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=2;BYDAY=3MO
</span><span class="cx"> SUMMARY:President's Day\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3189C321ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189C32-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189C32-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189C32-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20040223
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=2
</span><span class="cx"> SUMMARY:Washington's Birthday (actual)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3189DEC1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189DEC-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189DEC-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189DEC-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20040412
</span><span class="cx"> SEQUENCE:2
</span><span class="cx"> SUMMARY:Easter
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC3189F941ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189F94-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189F94-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C3189F94-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20060417
</span><span class="cx"> SEQUENCE:2
</span><span class="cx"> SUMMARY:Easter
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318A1481ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A148-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A148-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A148-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20040601
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=5;BYDAY=-1MO
</span><span class="cx"> SUMMARY:Memorial Day\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318A2F31ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A2F3-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A2F3-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A2F3-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10,5 +10,6 @@
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=5;BYDAY=1MO
</span><span class="cx"> SEQUENCE:5
</span><span class="cx"> SUMMARY:May Day (bank holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318A4BA1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A4BA-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A4BA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A4BA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20040705
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=7
</span><span class="cx"> SUMMARY:Independence Day\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318A6E11ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A6E1-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A6E1-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A6E1-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20040907
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=9;BYDAY=1MO
</span><span class="cx"> SUMMARY:Labor Day\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318A8981ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A898-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A898-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318A898-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20041012
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=10;BYDAY=2MO
</span><span class="cx"> SUMMARY:Columbus Day\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318AA541ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318AA54-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318AA54-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318AA54-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20041112
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=11
</span><span class="cx"> SUMMARY:Veteran's Day\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318ABFE1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318ABFE-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318ABFE-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318ABFE-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10,5 +10,6 @@
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=11;BYDAY=4TH
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> SUMMARY:Thanksgiving\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318ADAA1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318ADAA-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318ADAA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318ADAA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> DTEND;VALUE=DATE:20041226
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=12
</span><span class="cx"> SUMMARY:Christmas Day\n(fed holiday)
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318AF531ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318AF53-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318AF53-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318AF53-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10,5 +10,6 @@
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> SUMMARY:New Year's Eve
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318B1081ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318B108-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318B108-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318B108-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10,5 +10,6 @@
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=9;BYDAY=2SU
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> SUMMARY:Grandparent's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdataHolidaysC318B2D21ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318B2D2-1ED0-11D9-A5E0-000A958A3252.ics (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318B2D2-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/data/Holidays/C318B2D2-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -11,5 +11,6 @@
</span><span class="cx"> November
</span><span class="cx"> SEQUENCE:2
</span><span class="cx"> SUMMARY:Election Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_icalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_icalendar.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -10886,3 +10886,181 @@
</span><span class="cx"> changed = component.cleanOrganizerScheduleAgent()
</span><span class="cx"> self.assertEqual(sorted(normalize_iCalStr(component).splitlines()), sorted(normalize_iCalStr(result).splitlines()), msg=title)
</span><span class="cx"> self.assertEqual(changed, result_changed, msg=title)
</span><ins>+
+
+ def test_adjustedTransp(self):
+ """
+ Test that L{Component.adjustedTransp} returns the correct TRANSP value.
+ """
+
+ data = (
+ (
+ "Event timed, no TRANSP",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ORGANIZER:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ "OPAQUE",
+ ),
+ (
+ "Event timed, TRANSP:OPAQUE",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ORGANIZER:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY
+SUMMARY:Test
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
+""",
+ "OPAQUE",
+ ),
+ (
+ "Event timed, TRANSP:TRANSPARENT",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ORGANIZER:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY
+SUMMARY:Test
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+""",
+ "TRANSPARENT",
+ ),
+ (
+ "Event all-day, no TRANSP",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ORGANIZER:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ "TRANSPARENT",
+ ),
+ (
+ "Event all-day, TRANSP:OPAQUE",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ORGANIZER:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY
+SUMMARY:Test
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
+""",
+ "OPAQUE",
+ ),
+ (
+ "Event all-day, TRANSP:TRANSPARENT",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ORGANIZER:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY
+SUMMARY:Test
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+""",
+ "TRANSPARENT",
+ ),
+ (
+ "Todo timed, no TRANSP",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTODO
+UID:12345-67890
+DUE:20080601T120000Z
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ORGANIZER:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY
+SUMMARY:Test
+END:VTODO
+END:VCALENDAR
+""",
+ "OPAQUE",
+ ),
+ (
+ "Todo all-day, no TRANSP",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTODO
+UID:12345-67890
+DUE;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ORGANIZER:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY
+SUMMARY:Test
+END:VTODO
+END:VCALENDAR
+""",
+ "OPAQUE",
+ ),
+ )
+
+ for title, txt, result in data:
+ component = Component.fromString(txt).mainComponent()
+ transp = component.adjustedTransp()
+ self.assertEqual(transp, result, msg=title)
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_multigetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_multiget.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_multiget.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/twistedcaldav/test/test_multiget.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -136,6 +136,7 @@
</span><span class="cx"> DTSTAMP:20020101T121212Z
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20031231;BYMONTH=1
</span><span class="cx"> SUMMARY:New Year's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """.replace("\n", "\r\n"),
</span><span class="lines">@@ -150,6 +151,7 @@
</span><span class="cx"> DTSTAMP:20020101T121212Z
</span><span class="cx"> RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=2
</span><span class="cx"> SUMMARY:Valentine's Day
</span><ins>+TRANSP:TRANSPARENT
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """.replace("\n", "\r\n")
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingfreebusypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -356,6 +356,9 @@
</span><span class="cx"> fbtype,
</span><span class="cx"> ))
</span><span class="cx">
</span><ins>+ # Cache directory record lookup outside this loop as it is expensive and will likely
+ # always end up being called with the same organizer address.
+ recordUIDCache = {}
</ins><span class="cx"> for key in aggregated_resources.iterkeys():
</span><span class="cx">
</span><span class="cx"> name, uid, type, test_organizer = key
</span><span class="lines">@@ -375,8 +378,14 @@
</span><span class="cx"> if excludeuid:
</span><span class="cx"> # See if we have a UID match
</span><span class="cx"> if (excludeuid == uid):
</span><del>- test_record = (yield calresource.directoryService().recordWithCalendarUserAddress(test_organizer)) if test_organizer else None
- test_uid = test_record.uid if test_record else ""
</del><ins>+ if test_organizer:
+ test_uid = recordUIDCache.get(test_organizer)
+ if test_uid is None:
+ test_record = (yield calresource.directoryService().recordWithCalendarUserAddress(test_organizer))
+ test_uid = test_record.uid if test_record else ""
+ recordUIDCache[test_organizer] = test_uid
+ else:
+ test_uid = ""
</ins><span class="cx">
</span><span class="cx"> # Check that ORGANIZER's match (security requirement)
</span><span class="cx"> if (organizer is None) or (organizer_uid == test_uid):
</span><span class="lines">@@ -435,8 +444,14 @@
</span><span class="cx"> # See if we have a UID match
</span><span class="cx"> if (excludeuid == uid):
</span><span class="cx"> test_organizer = calendar.getOrganizer()
</span><del>- test_record = (yield calresource.principalForCalendarUserAddress(test_organizer)) if test_organizer else None
- test_uid = test_record.principalUID() if test_record else ""
</del><ins>+ if test_organizer:
+ test_uid = recordUIDCache.get(test_organizer)
+ if test_uid is None:
+ test_record = (yield calresource.directoryService().recordWithCalendarUserAddress(test_organizer))
+ test_uid = test_record.uid if test_record else ""
+ recordUIDCache[test_organizer] = test_uid
+ else:
+ test_uid = ""
</ins><span class="cx">
</span><span class="cx"> # Check that ORGANIZER's match (security requirement)
</span><span class="cx"> if (organizer is None) or (organizer_uid == test_uid):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> import hashlib
</span><span class="cx"> import json
</span><span class="cx"> import uuid
</span><ins>+import time
</ins><span class="cx">
</span><span class="cx"> """
</span><span class="cx"> CalDAV implicit processing.
</span><span class="lines">@@ -754,7 +755,9 @@
</span><span class="cx"> end=str(makeTimedUTC(instance.end)),
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ t = time.time()
</ins><span class="cx"> yield generateFreeBusyInfo(testcal, fbinfo, tr, 0, uid, servertoserver=True, accountingItems=accounting if len(instances) == 1 else None)
</span><ins>+ print time.time() - t
</ins><span class="cx">
</span><span class="cx"> # If any fbinfo entries exist we have an overlap
</span><span class="cx"> if len(fbinfo[0]) or len(fbinfo[1]) or len(fbinfo[2]):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13739 => 13740)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-07-09 19:33:24 UTC (rev 13739)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-07-09 19:36:55 UTC (rev 13740)
</span><span class="lines">@@ -3065,7 +3065,7 @@
</span><span class="cx"> start = instance.start
</span><span class="cx"> end = instance.end
</span><span class="cx"> floating = instance.start.floating()
</span><del>- transp = instance.component.propertyValue("TRANSP") == "TRANSPARENT"
</del><ins>+ transp = instance.component.adjustedTransp() == "TRANSPARENT"
</ins><span class="cx"> fbtype = instance.component.getFBType()
</span><span class="cx"> start.setTimezoneUTC(True)
</span><span class="cx"> end.setTimezoneUTC(True)
</span></span></pre>
</div>
</div>
</body>
</html>