<!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>[13767] CalendarServer/branches/users/gaya/groupsharee2</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/13767">13767</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-07-16 17:43:18 -0700 (Wed, 16 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>merge in trunk through <a href="http://trac.calendarserver.org//changeset/13765">r13765</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2bin_buildsh">CalendarServer/branches/users/gaya/groupsharee2/bin/_build.sh</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2bin_pysh">CalendarServer/branches/users/gaya/groupsharee2/bin/_py.sh</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2calendarservertoolsdbinspectpy">CalendarServer/branches/users/gaya/groupsharee2/calendarserver/tools/dbinspect.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2confauthaccountstestxml">CalendarServer/branches/users/gaya/groupsharee2/conf/auth/accounts-test.xml</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2confauthgenerate_test_accountspy">CalendarServer/branches/users/gaya/groupsharee2/conf/auth/generate_test_accounts.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2confcaldavdtestplist">CalendarServer/branches/users/gaya/groupsharee2/conf/caldavd-test.plist</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribperformanceloadtestsimpy">CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/loadtest/sim.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestshttpTestspy">CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/httpTests.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestsmultigetpy">CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/multiget.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestspropfindpy">CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/propfind.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestspropfind_invitepy">CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/propfind_invite.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestsquerypy">CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/query.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestssyncpy">CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/sync.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagesqlusagepy">CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/sqlusage.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2requirementsdevtxt">CalendarServer/branches/users/gaya/groupsharee2/requirements-dev.txt</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2requirementsstabletxt">CalendarServer/branches/users/gaya/groupsharee2/requirements-stable.txt</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavdatafiltersperuserdatapy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/datafilters/peruserdata.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavdatafilterstesttest_peruserdatapy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/datafilters/test/test_peruserdata.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavicalpy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavmethodgetpy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/get.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavmethodreport_calendar_querypy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/report_calendar_query.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavmethodreport_commonpy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/report_common.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavresourcepy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavscheduling_storecaldavresourcepy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/scheduling_store/caldav/resource.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavstorebridgepy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3184A661ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3184A66-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3184D261ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3184D26-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31853261ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185326-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31854DA1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31854DA-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31856AC1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31856AC-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318585A1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318585A-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3185A141ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185A14-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3185BBD1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185BBD-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3185D631ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185D63-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3185F201ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185F20-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31860C81ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31860C8-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318627C1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318627C-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31864261ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186426-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31865E41ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31865E4-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31867921ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186792-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31869381ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186938-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3186ADE1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186ADE-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3186C961ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186C96-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3186E3A1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186E3A-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3186FE71ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186FE7-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318719A1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318719A-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31873431ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3187343-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31889061ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188906-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3188B3A1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188B3A-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3188CFF1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188CFF-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3188EAA1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188EAA-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31890581ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189058-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31892031ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189203-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31893C21ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31893C2-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31895721ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189572-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31897161ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189716-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31898D41ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31898D4-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3189A881ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189A88-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3189C321ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189C32-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3189DEC1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189DEC-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3189F941ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189F94-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A1481ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A148-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A2F31ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A2F3-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A4BA1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A4BA-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A6E11ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A6E1-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A8981ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A898-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318AA541ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318AA54-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318ABFE1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318ABFE-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318ADAA1ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318ADAA-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318AF531ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318AF53-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318B1081ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318B108-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318B2D21ED011D9A5E0000A958A3252ics">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318B2D2-1ED0-11D9-A5E0-000A958A3252.ics</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtesttest_icalendarpy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/test_icalendar.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavtesttest_multigetpy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/test_multiget.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoreschedulingfreebusypy">CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/scheduling/freebusy.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoreschedulingprocessingpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoresqlpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavdpsclientpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/dps/client.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribtoolsstatsanalysispy">CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/statsanalysis.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayagroupsharee2bin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/bin/_build.sh (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/bin/_build.sh 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/bin/_build.sh 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> dep_packages="${TWEXT_PKG_CACHE}";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- project="$(setup_print name)";
</del><ins>+ project="$(setup_print name)" || project="<unknown>";
</ins><span class="cx">
</span><span class="cx"> # Find some hashing commands
</span><span class="cx"> # sha1() = sha1 hash, if available
</span><span class="lines">@@ -121,34 +121,34 @@
</span><span class="cx">
</span><span class="cx"> hash="";
</span><span class="cx">
</span><del>- if type -ft openssl > /dev/null; then
</del><ins>+ if find_cmd openssl > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="md5"; fi;
</span><del>- md5 () { "$(type -p openssl)" dgst -md5 "$@"; }
- elif type -ft md5 > /dev/null; then
</del><ins>+ md5 () { "$(find_cmd openssl)" dgst -md5 "$@"; }
+ elif find_cmd md5 > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="md5"; fi;
</span><del>- md5 () { "$(type -p md5)" "$@"; }
- elif type -ft md5sum > /dev/null; then
</del><ins>+ md5 () { "$(find_cmd md5)" "$@"; }
+ elif find_cmd md5sum > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="md5"; fi;
</span><del>- md5 () { "$(type -p md5sum)" "$@"; }
</del><ins>+ md5 () { "$(find_cmd md5sum)" "$@"; }
</ins><span class="cx"> fi;
</span><span class="cx">
</span><del>- if type -ft sha1sum > /dev/null; then
</del><ins>+ if find_cmd sha1sum > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="sha1sum"; fi;
</span><del>- sha1 () { "$(type -p sha1sum)" "$@"; }
</del><ins>+ sha1 () { "$(find_cmd sha1sum)" "$@"; }
</ins><span class="cx"> fi;
</span><del>- if type -ft shasum > /dev/null; then
</del><ins>+ if find_cmd shasum > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="sha1"; fi;
</span><del>- sha1 () { "$(type -p shasum)" "$@"; }
</del><ins>+ sha1 () { "$(find_cmd shasum)" "$@"; }
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> if [ "${hash}" = "sha1" ]; then
</span><span class="cx"> hash () { sha1 "$@"; }
</span><span class="cx"> elif [ "${hash}" = "md5" ]; then
</span><span class="cx"> hash () { md5 "$@"; }
</span><del>- elif type -t cksum > /dev/null; then
</del><ins>+ elif find_cmd cksum > /dev/null; then
</ins><span class="cx"> hash="hash";
</span><span class="cx"> hash () { cksum "$@" | cut -f 1 -d " "; }
</span><del>- elif type -t sum > /dev/null; then
</del><ins>+ elif find_cmd sum > /dev/null; then
</ins><span class="cx"> hash="hash";
</span><span class="cx"> hash () { sum "$@" | cut -f 1 -d " "; }
</span><span class="cx"> else
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> setup_print () {
</span><span class="cx"> what="$1"; shift;
</span><span class="cx">
</span><del>- PYTHONPATH="${wd}:${PYTHONPATH:-}" "${bootstrap_python}" - << EOF
</del><ins>+ PYTHONPATH="${wd}:${PYTHONPATH:-}" "${bootstrap_python}" - 2>/dev/null << EOF
</ins><span class="cx"> from __future__ import print_function
</span><span class="cx"> import setup
</span><span class="cx"> print(setup.${what})
</span><span class="lines">@@ -568,11 +568,13 @@
</span><span class="cx"> #
</span><span class="cx"> py_dependencies () {
</span><span class="cx"> python="${py_bindir}/python";
</span><ins>+ py_ve_tools="${dev_home}/ve_tools";
</ins><span class="cx">
</span><span class="cx"> export PATH="${py_virtualenv}/bin:${PATH}";
</span><span class="cx"> export PYTHON="${python}";
</span><del>- export PYTHONPATH="${wd}:${PYTHONPATH:-}";
</del><ins>+ export PYTHONPATH="${py_ve_tools}/lib:${wd}:${PYTHONPATH:-}";
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # Work around a change in Xcode tools that breaks Python modules in OS X
</span><span class="cx"> # 10.9.2 and prior due to a hard error if the -mno-fused-madd is used, as
</span><span class="cx"> # it was in the system Python, and is therefore passed along by disutils.
</span><span class="lines">@@ -601,7 +603,7 @@
</span><span class="cx">
</span><span class="cx"> # Make sure setup got called enough to write the version file.
</span><span class="cx">
</span><del>- "${python}" "${wd}/setup.py" check > /dev/null;
</del><ins>+ PYTHONPATH="${PYTHONPATH}" "${python}" "${wd}/setup.py" check > /dev/null;
</ins><span class="cx">
</span><span class="cx"> if [ -d "${dev_home}/pip_downloads" ]; then
</span><span class="cx"> pip_install="pip_install_from_cache";
</span><span class="lines">@@ -626,24 +628,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> bootstrap_virtualenv () {
</span><del>- py_ve_tools="${dev_home}/ve_tools";
-
- if [ -d "${py_ve_tools}/lib" ]; then
- export PYTHONPATH="${py_ve_tools}/lib:${PYTHONPATH:-}";
- fi;
-
- if "${bootstrap_python}" -m virtualenv > /dev/null 2>&1; then
- return 0;
- fi;
-
</del><span class="cx"> mkdir -p "${py_ve_tools}";
</span><span class="cx"> mkdir -p "${py_ve_tools}/lib";
</span><span class="cx"> mkdir -p "${py_ve_tools}/junk";
</span><span class="cx">
</span><span class="cx"> for pkg in \
</span><del>- pip-1.5.4 \
- virtualenv-1.11.4 \
- setuptools-3.4.4 \
</del><ins>+ setuptools-5.4.1 \
+ pip-1.5.6 \
+ virtualenv-1.11.6 \
</ins><span class="cx"> ; do
</span><span class="cx"> name="${pkg%-*}";
</span><span class="cx"> version="${pkg#*-}";
</span><span class="lines">@@ -669,8 +661,6 @@
</span><span class="cx">
</span><span class="cx"> rm -rf "${tmp}";
</span><span class="cx"> done;
</span><del>-
- export PYTHONPATH="${py_ve_tools}/lib:${PYTHONPATH:-}";
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2bin_pysh"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/bin/_py.sh (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/bin/_py.sh 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/bin/_py.sh 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -15,6 +15,18 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+find_cmd () {
+ local cmd="$1"; shift;
+
+ local path="$(type "${cmd}" 2>/dev/null | sed "s|^${cmd} is \(a tracked alias for \)\{0,1\}||")";
+
+ if [ -z "${cmd}" ]; then
+ return 1;
+ fi;
+
+ echo "${path}";
+}
+
</ins><span class="cx"> # Echo the major.minor version of the given Python interpreter.
</span><span class="cx">
</span><span class="cx"> py_version () {
</span><span class="lines">@@ -38,7 +50,7 @@
</span><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> local py_version="$(py_version "${python}")";
</span><del>- if [ "${py_version/./}" -lt "25" ]; then
</del><ins>+ if [ "$(echo "${py_version}" | sed 's|\.||')" -lt "25" ]; then
</ins><span class="cx"> return 1;
</span><span class="cx"> fi;
</span><span class="cx"> return 0;
</span><span class="lines">@@ -72,7 +84,7 @@
</span><span class="cx"> "/sw/bin/python${v}" \
</span><span class="cx"> ;
</span><span class="cx"> do
</span><del>- if p="$(type -p "${p}")"; then
</del><ins>+ if p="$(find_cmd "${p}")"; then
</ins><span class="cx"> if try_python "${p}"; then
</span><span class="cx"> echo "${p}";
</span><span class="cx"> return 0;
</span><span class="lines">@@ -148,7 +160,7 @@
</span><span class="cx"> # the part of the PostgreSQL build process which builds pl_python. Note that
</span><span class="cx"> # detect_python_version, above, already honors $PYTHON, so if this is already
</span><span class="cx"> # set it won't be stomped on, it will just be re-set to the same value.
</span><del>- export PYTHON="$(type -p ${bootstrap_python})";
</del><ins>+ export PYTHON="$(find_cmd ${bootstrap_python})";
</ins><span class="cx">
</span><span class="cx"> if [ -z "${bootstrap_python:-}" ]; then
</span><span class="cx"> echo "No suitable python found. Python 2.6 or 2.7 is required.";
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2calendarservertoolsdbinspectpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/calendarserver/tools/dbinspect.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/calendarserver/tools/dbinspect.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/calendarserver/tools/dbinspect.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2confauthaccountstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/conf/auth/accounts-test.xml (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/conf/auth/accounts-test.xml 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/conf/auth/accounts-test.xml 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -844,6 +844,14 @@
</span><span class="cx"> <email>user100@example.com</email>
</span><span class="cx"> </record>
</span><span class="cx"> <record type="user">
</span><ins>+ <uid>10000000-0000-0000-0000-000000000101</uid>
+ <guid>10000000-0000-0000-0000-000000000101</guid>
+ <short-name>user101</short-name>
+ <password>user101</password>
+ <full-name>User 101</full-name>
+ <email>user101@example.com</email>
+</record>
+<record type="user">
</ins><span class="cx"> <uid>50000000-0000-0000-0000-000000000001</uid>
</span><span class="cx"> <guid>50000000-0000-0000-0000-000000000001</guid>
</span><span class="cx"> <short-name>public01</short-name>
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2confauthgenerate_test_accountspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/conf/auth/generate_test_accounts.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/conf/auth/generate_test_accounts.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/conf/auth/generate_test_accounts.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> </record>
</span><span class="cx"> """.format(uid=uid, guid=guid, fullName=fullName))
</span><span class="cx">
</span><del>-# user01-100
-for i in xrange(1, 501 if EXTRA_GROUPS else 101):
</del><ins>+# user01-101
+for i in xrange(1, 501 if EXTRA_GROUPS else 102):
</ins><span class="cx"> out.write("""<record type="user">
</span><span class="cx"> <uid>{guid}</uid>
</span><span class="cx"> <guid>{guid}</guid>
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2confcaldavdtestplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/conf/caldavd-test.plist (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/conf/caldavd-test.plist 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/conf/caldavd-test.plist 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -784,34 +784,6 @@
</span><span class="cx"> <!-- General options for scheduling -->
</span><span class="cx"> <key>Options</key>
</span><span class="cx"> <dict>
</span><del>- <key>AllowGroupAsOrganizer</key>
- <false/>
- <key>AllowLocationAsOrganizer</key>
- <false/>
- <key>AllowResourceAsOrganizer</key>
- <false/>
- <key>AttendeeRefreshBatch</key>
- <integer>0</integer>
- <key>AttendeeRefreshCountLimit</key>
- <integer>50</integer>
-
- <key>AutoSchedule</key>
- <dict>
- <key>Enabled</key>
- <true/>
- <key>Always</key>
- <false/>
- <!-- Default mode for auto-schedule processing, one of:
- "none" - no auto-scheduling
- "accept-always" - always accept, ignore busy time
- "decline-always" - always decline, ignore free time
- "accept-if-free" - accept if free, do nothing if busy
- "decline-if-busy" - decline if busy, do nothing if free
- "automatic" - accept if free, decline if busy -->
- <key>DefaultMode</key>
- <string>automatic</string>
- </dict>
-
</del><span class="cx"> <key>WorkQueues</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>Enabled</key>
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribperformanceloadtestsimpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/loadtest/sim.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/loadtest/sim.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/loadtest/sim.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> _ignore_scheme, hostname, _ignore_path, _ignore_query, _ignore_fragment = urlsplit(self.serverStats["server"])
</span><span class="cx"> data = self.readStatsSock((hostname.split(":")[0], self.serverStats["Port"],), True)
</span><span class="cx"> if "Failed" not in data:
</span><del>- data = data["stats"]["5m"]
</del><ins>+ data = data["stats"]["5m"] if "stats" in data else data["5 Minutes"]
</ins><span class="cx"> result = (
</span><span class="cx"> safeDivision(float(data["requests"]), 5 * 60),
</span><span class="cx"> safeDivision(data["t"], data["requests"]),
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestshttpTestspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/httpTests.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/httpTests.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/httpTests.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> self.timing = timing
</span><span class="cx">
</span><span class="cx">
</span><del>- def __init__(self, label, sessions, logFilePath):
</del><ins>+ def __init__(self, label, sessions, logFilePath, logFilePrefix):
</ins><span class="cx"> """
</span><span class="cx"> @param label: label used to identify the test
</span><span class="cx"> @type label: C{str}
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> self.label = label
</span><span class="cx"> self.sessions = sessions
</span><span class="cx"> self.logFilePath = logFilePath
</span><ins>+ self.logFilePrefix = logFilePrefix
</ins><span class="cx"> self.result = None
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -95,7 +96,7 @@
</span><span class="cx"> offset = 0
</span><span class="cx"> while True:
</span><span class="cx"> if lines[offset] == "*** SQL Stats ***":
</span><del>- if lines[offset + 2].split()[1] != "unlabeled":
</del><ins>+ if lines[offset + 2].startswith("Label: <"):
</ins><span class="cx"> count = extractInt(lines[offset + 4])
</span><span class="cx"> rows = extractInt(lines[offset + 5])
</span><span class="cx"> timing = extractFloat(lines[offset + 6])
</span><span class="lines">@@ -105,7 +106,8 @@
</span><span class="cx"> else:
</span><span class="cx"> self.result = HTTPTestBase.SQLResults(-1, -1, 0.0)
</span><span class="cx">
</span><del>- with open("%s-%d-%s" % (self.logFilePath, event_count, self.label), "w") as f:
</del><ins>+ # Archive current sqlstats file
+ with open("%s-%s-%d-%s" % (self.logFilePath, self.logFilePrefix, event_count, self.label), "w") as f:
</ins><span class="cx"> f.write(data)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestsmultigetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/multiget.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/multiget.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/multiget.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> A multiget operation
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, label, sessions, logFilePath, count):
- super(MultigetTest, self).__init__(label, sessions, logFilePath)
</del><ins>+ def __init__(self, label, sessions, logFilePath, logFilePrefix, count):
+ super(MultigetTest, self).__init__(label, sessions, logFilePath, logFilePrefix)
</ins><span class="cx"> self.count = count
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestspropfindpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/propfind.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/propfind.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/propfind.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx"> A propfind operation
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, label, sessions, logFilePath, depth=1):
- super(PropfindTest, self).__init__(label, sessions, logFilePath)
</del><ins>+ def __init__(self, label, sessions, logFilePath, logFilePrefix, depth=1):
+ super(PropfindTest, self).__init__(label, sessions, logFilePath, logFilePrefix)
</ins><span class="cx"> self.depth = headers.Depth1 if depth == 1 else headers.Depth0
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestspropfind_invitepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/propfind_invite.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/propfind_invite.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/propfind_invite.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> A propfind operation
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, label, sessions, logFilePath, depth=1):
- super(PropfindInviteTest, self).__init__(label, sessions, logFilePath)
</del><ins>+ def __init__(self, label, sessions, logFilePath, logFilePrefix, depth=1):
+ super(PropfindInviteTest, self).__init__(label, sessions, logFilePath, logFilePrefix)
</ins><span class="cx"> self.depth = headers.Depth1 if depth == 1 else headers.Depth0
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestsquerypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/query.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/query.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/query.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> A sync operation
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, label, sessions, logFilePath, count):
- super(QueryTest, self).__init__(label, sessions, logFilePath)
</del><ins>+ def __init__(self, label, sessions, logFilePath, logFilePrefix, count):
+ super(QueryTest, self).__init__(label, sessions, logFilePath, logFilePrefix)
</ins><span class="cx"> self.count = count
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagerequestssyncpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/sync.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/sync.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/requests/sync.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> A sync operation
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, label, sessions, logFilePath, full, count):
- super(SyncTest, self).__init__(label, sessions, logFilePath)
</del><ins>+ def __init__(self, label, sessions, logFilePath, logFilePrefix, full, count):
+ super(SyncTest, self).__init__(label, sessions, logFilePath, logFilePrefix)
</ins><span class="cx"> self.full = full
</span><span class="cx"> self.count = count
</span><span class="cx"> self.synctoken = ""
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribperformancesqlusagesqlusagepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/sqlusage.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/sqlusage.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/performance/sqlusage/sqlusage.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -115,15 +115,15 @@
</span><span class="cx">
</span><span class="cx"> # Set of requests to execute
</span><span class="cx"> requests = [
</span><del>- MultigetTest("mget-1" if self.compact else "multiget-1", sessions, self.logFilePath, 1),
- MultigetTest("mget-50" if self.compact else "multiget-50", sessions, self.logFilePath, 50),
- PropfindTest("prop-cal" if self.compact else "propfind-cal", sessions, self.logFilePath, 1),
- SyncTest("s-full" if self.compact else "sync-full", sessions, self.logFilePath, True, 0),
- SyncTest("s-1" if self.compact else "sync-1", sessions, self.logFilePath, False, 1),
- QueryTest("q-1" if self.compact else "query-1", sessions, self.logFilePath, 1),
- QueryTest("q-10" if self.compact else "query-10", sessions, self.logFilePath, 10),
- PutTest("put", sessions, self.logFilePath),
- InviteTest("invite", sessions, self.logFilePath),
</del><ins>+ MultigetTest("mget-1" if self.compact else "multiget-1", sessions, self.logFilePath, "event", 1),
+ MultigetTest("mget-50" if self.compact else "multiget-50", sessions, self.logFilePath, "event", 50),
+ PropfindTest("prop-cal" if self.compact else "propfind-cal", sessions, self.logFilePath, "event", 1),
+ SyncTest("s-full" if self.compact else "sync-full", sessions, self.logFilePath, "event", True, 0),
+ SyncTest("s-1" if self.compact else "sync-1", sessions, self.logFilePath, "event", False, 1),
+ QueryTest("q-1" if self.compact else "query-1", sessions, self.logFilePath, "event", 1),
+ QueryTest("q-10" if self.compact else "query-10", sessions, self.logFilePath, "event", 10),
+ PutTest("put", sessions, self.logFilePath, "event"),
+ InviteTest("invite", sessions, self.logFilePath, "event"),
</ins><span class="cx"> ]
</span><span class="cx"> self.requestLabels = [request.label for request in requests]
</span><span class="cx">
</span><span class="lines">@@ -221,14 +221,14 @@
</span><span class="cx">
</span><span class="cx"> # Set of requests to execute
</span><span class="cx"> requests = [
</span><del>- MultigetTest("mget-1" if self.compact else "multiget-1", sessions, self.logFilePath, 1),
- MultigetTest("mget-50" if self.compact else "multiget-50", sessions, self.logFilePath, 50),
- PropfindInviteTest("propfind", sessions, self.logFilePath, 1),
- SyncTest("s-full" if self.compact else "sync-full", sessions, self.logFilePath, True, 0),
- SyncTest("s-1" if self.compact else "sync-1", sessions, self.logFilePath, False, 1),
- QueryTest("q-1" if self.compact else "query-1", sessions, self.logFilePath, 1),
- QueryTest("q-10" if self.compact else "query-10", sessions, self.logFilePath, 10),
- PutTest("put", sessions, self.logFilePath),
</del><ins>+ MultigetTest("mget-1" if self.compact else "multiget-1", sessions, self.logFilePath, "share", 1),
+ MultigetTest("mget-50" if self.compact else "multiget-50", sessions, self.logFilePath, "share", 50),
+ PropfindInviteTest("propfind", sessions, self.logFilePath, "share", 1),
+ SyncTest("s-full" if self.compact else "sync-full", sessions, self.logFilePath, "share", True, 0),
+ SyncTest("s-1" if self.compact else "sync-1", sessions, self.logFilePath, "share", False, 1),
+ QueryTest("q-1" if self.compact else "query-1", sessions, self.logFilePath, "share", 1),
+ QueryTest("q-10" if self.compact else "query-10", sessions, self.logFilePath, "share", 10),
+ PutTest("put", sessions, self.logFilePath, "share"),
</ins><span class="cx"> ]
</span><span class="cx"> self.requestLabels = [request.label for request in requests]
</span><span class="cx">
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> for i in range(n - self.currentCount):
</span><span class="cx"> index = self.currentCount + i + 2
</span><span class="cx"> users.append("user%02d" % (index,))
</span><del>- uids.append("urn:x-uid:user%02d" % (index,))
</del><ins>+ uids.append("urn:x-uid:10000000-0000-0000-0000-000000000%03d" % (index,))
</ins><span class="cx"> session.addInvitees(URL(path=calendarhref), uids, True)
</span><span class="cx">
</span><span class="cx"> # Now accept each one
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribtoolsstatsanalysispyfromrev13765CalendarServertrunkcontribtoolsstatsanalysispy"></a>
<div class="copfile"><h4>Copied: CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/statsanalysis.py (from rev 13765, CalendarServer/trunk/contrib/tools/statsanalysis.py) (0 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/statsanalysis.py (rev 0)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/statsanalysis.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -0,0 +1,217 @@
</span><ins>+#!/usr/bin/env python
+##
+# Copyright (c) 2010-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+from __future__ import print_function
+
+import getopt
+import matplotlib.pyplot as plt
+import os
+import sys
+
+dataset = {}
+
+def analyze(fpath, title):
+
+ print("Analyzing data for %s" % (fpath,))
+ dataset[title] = {}
+ with open(fpath) as f:
+ for line in f:
+ if line.startswith("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"):
+ analyzeRecord(f, title)
+
+ print("Stored %d data points" % (len(dataset[title]),))
+
+
+def analyzeRecord(liter, title):
+
+ dt = liter.next()
+ time = dt[11:]
+ seconds = 60 * (60 * int(time[0:2]) + int(time[3:5])) + int(time[6:8])
+ for line in liter:
+ if line.startswith("| Overall:"):
+ overall = parseOverall(line)
+ dataset[title][seconds] = overall
+ elif line.startswith("| Method"):
+ methods = parseMethods(liter)
+ dataset[title][seconds].update(methods)
+ break
+
+def parseOverall(line):
+
+ splits = line.split("|")
+ overall = {}
+ keys = (
+ ("Requests", lambda x: int(x)),
+ ("Av. Requests per second", lambda x: float(x)),
+ ("Av. Response", lambda x: float(x)),
+ ("Av. Response no write", lambda x: float(x)),
+ ("Max. Response", lambda x: float(x)),
+ ("Slot Average", lambda x: float(x)),
+ ("CPU Average", lambda x: float(x[:-1])),
+ ("CPU Current", lambda x: float(x[:-1])),
+ ("Memory Current", lambda x: float(x[:-1])),
+ ("500's", lambda x: int(x)),
+ )
+ for ctr, item in enumerate(keys):
+ key, conv = item
+ overall["Overall:{}".format(key)] = conv(splits[2 + ctr].strip())
+
+ return overall
+
+
+def parseMethods(liter):
+
+ while liter.next()[1] != "-":
+ pass
+
+ methods = {}
+ for line in liter:
+ if line[0] == "+":
+ break
+ splits = line.split("|")
+ keys = (
+ ("Count", lambda x: int(x)),
+ ("Count %", lambda x: float(x[:-1])),
+ ("Av. Response", lambda x: float(x)),
+ ("Av. Response %", lambda x: float(x[:-1])),
+ ("Total Resp. %", lambda x: float(x[:-1])),
+ )
+ for ctr, item in enumerate(keys):
+ key, conv = item
+ methods["Method:{}:{}".format(splits[1].strip(), key)] = conv(splits[2 + ctr].strip())
+
+ return methods
+
+
+def plotSeries(key, ymin=None, ymax=None):
+
+
+ color = iter(("b+", "r+", "g+",))
+ for _ignore_title, data in sorted(dataset.items(), key=lambda x: x[0]):
+ x1, y1 = zip(*[(k / 3600.0, v[key]) for k, v in sorted(data.items(), key=lambda x: x[0]) if key in v])
+
+ # print("".join(["{}\t{}\n".format(x, y) for x, y in zip(x1, y1)]))
+
+ plt.plot(x1, y1, color.next())
+
+ #plt.legend((key,), 'upper left', shadow=True, fancybox=True)
+ plt.xlabel("Hours")
+ plt.ylabel(key)
+ plt.xlim(0, 24)
+ if ymin is not None:
+ plt.ylim(ymin=ymin)
+ if ymax is not None:
+ plt.ylim(ymax=ymax)
+ plt.xticks(
+ (1, 4, 7, 10, 13, 16, 19, 22,),
+ (18, 21, 0, 3, 6, 9, 12, 15,),
+ )
+ plt.show()
+
+
+def usage(error_msg=None):
+ if error_msg:
+ print(error_msg)
+
+ print("""Usage: statsanalysis [options]
+Options:
+ -h Print this help and exit
+ -s Directory to scan for data [~/stats]
+
+Arguments:
+
+Description:
+This utility will analyze the output of the readStats tool and
+generate some pretty plots of data.
+""")
+
+ if error_msg:
+ raise ValueError(error_msg)
+ else:
+ sys.exit(0)
+
+if __name__ == "__main__":
+
+ scanDir = os.path.expanduser("~/stats")
+ options, args = getopt.getopt(sys.argv[1:], "hs:", [])
+
+ for option, value in options:
+ if option == "-h":
+ usage()
+ elif option == "-s":
+ scanDir = os.path.expanduser(value)
+ else:
+ usage("Unrecognized option: %s" % (option,))
+
+ if scanDir and len(args) != 0:
+ usage("No arguments allowed when scanning a directory")
+
+ pwd = os.getcwd()
+
+ fnames = os.listdir(scanDir)
+ count = 1
+ for name in fnames:
+ if name.startswith("stats_all.log"):
+ print("Found file: %s" % (os.path.join(scanDir, name),))
+ trailer = name[len("stats_all.log"):]
+ if trailer.startswith("-"):
+ trailer = trailer[1:]
+ initialDate = None
+ analyze(os.path.join(scanDir, name), trailer)
+ count += 1
+
+ keys = set()
+ for data in dataset.values():
+ for items in data.values():
+ keys.update([":".join(k.split(":")[:2]) for k in items.keys()])
+ keys = sorted(list(keys))
+ while True:
+ print("Select a key:")
+ print("\n".join(["{:2d}. {}".format(ctr + 1, key) for ctr, key in enumerate(keys)]))
+ print(" Q. Quit\n")
+ cmd = raw_input("Key: ")
+ if cmd.lower() == 'q':
+ print("\nQuitting")
+ break
+ try:
+ position = int(cmd) - 1
+ except ValueError:
+ print("Invalid key. Try again.\n")
+ continue
+
+ if keys[position].startswith("Method:"):
+ key = keys[position]
+ methodkeys = ("Count", "Count %", "Av. Response", "Av. Response %", "Total Resp. %")
+ while True:
+ print("Select a sub-key:")
+ print("\n".join(["{:2d}. {}".format(ctr + 1, subkey) for ctr, subkey in enumerate(methodkeys)]))
+ print(" B. Back\n")
+ cmd = raw_input("SubKey: ")
+ if cmd.lower() == 'b':
+ key = None
+ break
+ try:
+ position = int(cmd) - 1
+ except ValueError:
+ print("Invalid subkey. Try again.\n")
+ continue
+ break
+ key = "{}:{}".format(key, methodkeys[position]) if key is not None else None
+ else:
+ key = keys[position]
+
+ if key:
+ plotSeries(key, ymin=0, ymax=None)
</ins></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2requirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/requirements-dev.txt (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/requirements-dev.txt 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/requirements-dev.txt 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -7,4 +7,4 @@
</span><span class="cx"> mockldap
</span><span class="cx"> q
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13716#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13739#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2requirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/requirements-stable.txt (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/requirements-stable.txt 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/requirements-stable.txt 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> # For CalendarServer development, don't try to get these projects from PyPI; use svn.
</span><span class="cx">
</span><span class="cx"> -e .
</span><del>--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13724#egg=twextpy
</del><ins>+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13750#egg=twextpy
</ins><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
</span><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13711#egg=pycalendar
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2twistedcaldavdatafiltersperuserdatapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/datafilters/peruserdata.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/datafilters/peruserdata.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/datafilters/peruserdata.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavdatafilterstesttest_peruserdatapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/datafilters/test/test_peruserdata.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/datafilters/test/test_peruserdata.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/datafilters/test/test_peruserdata.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/ical.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/ical.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/ical.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavmethodgetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/get.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/get.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/get.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavmethodreport_calendar_querypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/report_calendar_query.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/report_calendar_query.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/report_calendar_query.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavmethodreport_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/report_common.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/report_common.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/method/report_common.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/resource.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/resource.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/resource.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavscheduling_storecaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/scheduling_store/caldav/resource.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/scheduling_store/caldav/resource.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/scheduling_store/caldav/resource.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -149,6 +149,11 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def dynamicProperties(self):
+ return super(ScheduleInboxResource, self).dynamicProperties() + (
+ customxml.CalendarAvailability.qname(),
+ )
+
</ins><span class="cx"> def resourceType(self):
</span><span class="cx"> return davxml.ResourceType.scheduleInbox
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2twistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/storebridge.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/storebridge.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/storebridge.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3184A661ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3184A66-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3184A66-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3184A66-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3184D261ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3184D26-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3184D26-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3184D26-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31853261ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185326-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185326-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185326-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31854DA1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31854DA-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31854DA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31854DA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31856AC1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31856AC-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31856AC-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31856AC-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318585A1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318585A-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318585A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318585A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3185A141ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185A14-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185A14-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185A14-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3185BBD1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185BBD-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185BBD-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185BBD-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3185D631ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185D63-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185D63-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185D63-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3185F201ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185F20-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185F20-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3185F20-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31860C81ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31860C8-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31860C8-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31860C8-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318627C1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318627C-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318627C-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318627C-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31864261ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186426-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186426-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186426-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31865E41ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31865E4-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31865E4-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31865E4-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31867921ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186792-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186792-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186792-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31869381ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186938-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186938-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186938-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3186ADE1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186ADE-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186ADE-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186ADE-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3186C961ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186C96-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186C96-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186C96-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3186E3A1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186E3A-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186E3A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186E3A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3186FE71ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186FE7-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186FE7-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3186FE7-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318719A1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318719A-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318719A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318719A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31873431ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3187343-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3187343-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3187343-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31889061ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188906-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188906-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188906-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3188B3A1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188B3A-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188B3A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188B3A-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3188CFF1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188CFF-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188CFF-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188CFF-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3188EAA1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188EAA-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188EAA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3188EAA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31890581ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189058-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189058-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189058-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31892031ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189203-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189203-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189203-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31893C21ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31893C2-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31893C2-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31893C2-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31895721ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189572-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189572-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189572-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31897161ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189716-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189716-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189716-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC31898D41ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31898D4-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31898D4-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C31898D4-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3189A881ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189A88-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189A88-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189A88-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3189C321ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189C32-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189C32-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189C32-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3189DEC1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189DEC-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189DEC-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189DEC-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC3189F941ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189F94-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189F94-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C3189F94-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A1481ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A148-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A148-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A148-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A2F31ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A2F3-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A2F3-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A2F3-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A4BA1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A4BA-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A4BA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A4BA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A6E11ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A6E1-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A6E1-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A6E1-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318A8981ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A898-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A898-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318A898-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318AA541ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318AA54-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318AA54-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318AA54-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318ABFE1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318ABFE-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318ABFE-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318ABFE-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318ADAA1ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318ADAA-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318ADAA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318ADAA-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318AF531ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318AF53-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318AF53-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318AF53-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318B1081ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318B108-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318B108-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318B108-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtestdataHolidaysC318B2D21ED011D9A5E0000A958A3252ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318B2D2-1ED0-11D9-A5E0-000A958A3252.ics (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318B2D2-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/data/Holidays/C318B2D2-1ED0-11D9-A5E0-000A958A3252.ics 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtesttest_icalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/test_icalendar.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/test_icalendar.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/test_icalendar.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2twistedcaldavtesttest_multigetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/test_multiget.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/test_multiget.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/test/test_multiget.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoreschedulingfreebusypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/scheduling/freebusy.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/scheduling/freebusy.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/scheduling/freebusy.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/scheduling/processing.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/scheduling/processing.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/scheduling/processing.py 2014-07-17 00:43:18 UTC (rev 13767)
</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="CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -3415,7 +3415,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>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/dps/client.py (13766 => 13767)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/dps/client.py 2014-07-16 23:30:52 UTC (rev 13766)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/dps/client.py 2014-07-17 00:43:18 UTC (rev 13767)
</span><span class="lines">@@ -195,8 +195,8 @@
</span><span class="cx"> if "fieldsList" in results:
</span><span class="cx"> numResults = len(results["fieldsList"])
</span><span class="cx"> log.debug(
</span><del>- "DPS call {command} duration={duration:.2f}s, results={numResults}",
- command=command, duration=duration, numResults=numResults
</del><ins>+ "DPS call {command} duration={duration:.2f}ms, results={numResults}",
+ command=command, duration=1000.0 * duration, numResults=numResults
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>