<!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>[12280] CalDAVTester/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12280">12280</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 07:30:43 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test client initiated smart recurrence spitting.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfopodxml">CalDAVTester/trunk/scripts/server/serverinfo-pod.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfotemplatexml">CalDAVTester/trunk/scripts/server/serverinfo-template.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfoxml">CalDAVTester/trunk/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalDAVTestertrunksrccaldavtestpy">CalDAVTester/trunk/src/caldavtest.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/</li>
<li>CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit1ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/1.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit2ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/2.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit3ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit4ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/4.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit5ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/5.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit6ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/6.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit7ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/7.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit8ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/8.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit9ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/9.ics</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple1ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/1.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple2ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/2.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple3ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple4ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/4.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple5ics">CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/5.ics</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVrecurrencesplittingxml">CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit1ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/1.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/1.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+RRULE:FREQ=DAILY;COUNT=20
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 1
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.-5:T120000Z
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 2
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.5:T120000Z
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 3
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/2.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/2.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY;COUNT=20
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 1
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.-5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 2
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 3
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit3ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/3.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/3.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY;COUNT=20
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.-5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit4ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/4.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/4.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY;COUNT=20
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder attendee 1
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.-5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder attendee 2
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder attendee 3
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit5ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/5.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/5.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY;COUNT=20
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 1
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.-5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 2
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 3
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit6ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/6.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/6.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RRULE:FREQ=DAILY;COUNT=10
+SEQUENCE:1
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 1
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+SEQUENCE:1
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 3
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit7ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/7.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/7.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$olduid:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RRULE:FREQ=DAILY;UNTIL=$now.0:T115959Z
+SEQUENCE:1
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 1
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$olduid:
+RECURRENCE-ID:$now.-5:T120000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+SEQUENCE:1
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder 2
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit8ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/8.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/8.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RRULE:FREQ=DAILY;COUNT=10
+SEQUENCE:1
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder attendee 1
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RECURRENCE-ID:$now.5:T120000Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+SEQUENCE:1
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder attendee 3
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingimplicit9ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/9.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/9.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/9.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$olduid:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RRULE:FREQ=DAILY;UNTIL=$now.0:T115959Z
+SEQUENCE:1
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder attendee 1
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-5:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$olduid:
+RECURRENCE-ID:$now.-5:T120000Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+SEQUENCE:1
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER:-PT5M
+DESCRIPTION:Reminder attendee 2
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple1ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/1.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/1.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/2.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/2.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple3ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/3.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/3.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RRULE:FREQ=DAILY;UNTIL=$now.0:T115959Z
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple4ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/4.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/4.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+RRULE:FREQ=DAILY;COUNT=10
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrecurrencesplittingsimple5ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/5.ics (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/5.ics 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfopodxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml (12279 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-01-10 03:39:29 UTC (rev 12279)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> <feature>private-events</feature> <!-- private-events extension -->
</span><span class="cx"> <feature>proxy</feature> <!-- calendar-user-proxy extension -->
</span><span class="cx"> <!-- <feature>proxy-authz</feature> --> <!-- sudo user extension -->
</span><ins>+ <feature>recurrence-splitting</feature> <!-- Recurring components can be split -->
</ins><span class="cx"> <feature>remove-duplicate-alarms</feature> <!-- Server removes any duplicate alarms on PUT -->
</span><span class="cx"> <feature>query-extended</feature> <!-- calendar-query-extended extension -->
</span><span class="cx"> <feature>shared-calendars</feature> <!-- Shared calendars extension -->
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfotemplatexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml (12279 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-01-10 03:39:29 UTC (rev 12279)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> <feature>private-events</feature> <!-- private-events extension -->
</span><span class="cx"> <feature>proxy</feature> <!-- calendar-user-proxy extension -->
</span><span class="cx"> <!-- <feature>proxy-authz</feature> --> <!-- sudo user extension -->
</span><ins>+ <feature>recurrence-splitting</feature> <!-- Recurring components can be split -->
</ins><span class="cx"> <feature>remove-duplicate-alarms</feature> <!-- Server removes any duplicate alarms on PUT -->
</span><span class="cx"> <feature>query-extended</feature> <!-- calendar-query-extended extension -->
</span><span class="cx"> <feature>shared-calendars</feature> <!-- Shared calendars extension -->
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml (12279 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-01-10 03:39:29 UTC (rev 12279)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> <feature>private-events</feature> <!-- private-events extension -->
</span><span class="cx"> <feature>proxy</feature> <!-- calendar-user-proxy extension -->
</span><span class="cx"> <!-- <feature>proxy-authz</feature> --> <!-- sudo user extension -->
</span><ins>+ <feature>recurrence-splitting</feature> <!-- Recurring components can be split -->
</ins><span class="cx"> <feature>remove-duplicate-alarms</feature> <!-- Server removes any duplicate alarms on PUT -->
</span><span class="cx"> <feature>query-extended</feature> <!-- calendar-query-extended extension -->
</span><span class="cx"> <feature>shared-calendars</feature> <!-- Shared calendars extension -->
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVrecurrencesplittingxml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml (0 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -0,0 +1,634 @@
</span><ins>+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2013 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.
+ -->
+
+<caldavtest>
+ <description>Test that POST to split recurrences works</description>
+
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>recurrence-splitting</feature>
+ </require-feature>
+
+ <start>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </start>
+
+
+ <test-suite name='OPTIONS header'>
+ <test name='1'>
+ <description>Look for options header tag on principal</description>
+ <request>
+ <method>OPTIONS</method>
+ <ruri>$principal1:</ruri>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>*DAV$.*calendarserver-recurrence-split*</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Look for options header tag on calendar home</description>
+ <request>
+ <method>OPTIONS</method>
+ <ruri>$calendarhome1:/</ruri>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>*DAV$.*calendarserver-recurrence-split*</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='No Organizer, no overrides, no prefer'>
+ <test name='1'>
+ <description>Create event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/simple/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST to split</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=split&amp;rid=$now.0:T000000Z</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ <grabheader>
+ <name>Split-Component-URL</name>
+ <variable>$href2:</variable>
+ </grabheader>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$href2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabcalproperty>
+ <name>VEVENT/UID</name>
+ <variable>$olduid:</variable>
+ </grabcalproperty>
+ </request>
+ </test>
+ <test name='3'>
+ <description>GET new-part split (original) resource</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/simple/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>GET old-part split (new resource)</description>
+ <request>
+ <method>GET</method>
+ <ruri>$href2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/simple/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='No Organizer, no overrides, prefer'>
+ <test name='1'>
+ <description>Create event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/simple/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST to split</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=split&amp;rid=$now.0:T000000Z</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>totalcount</name>
+ <value>2</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}getetag</value>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>$multistatus-href-prefix:</name>
+ <variable>$href1:</variable>
+ <variable>$href2:</variable>
+ </grabelement>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$href2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabcalproperty>
+ <name>VEVENT/UID</name>
+ <variable>$olduid:</variable>
+ </grabcalproperty>
+ </request>
+ </test>
+ <test name='3'>
+ <description>GET new-part split (original) resource</description>
+ <request>
+ <method>GET</method>
+ <ruri>$href1:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/simple/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>GET old-part split (new resource)</description>
+ <request>
+ <method>GET</method>
+ <ruri>$href2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/simple/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+
+ <test-suite name='Bad POSTs'>
+ <test name='1'>
+ <description>Create event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/simple/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST bad rid</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=split&amp;rid=FOOBAR</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{urn:ietf:params:xml:ns:caldav}valid-rid-parameter</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>POST no rid</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=split</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{urn:ietf:params:xml:ns:caldav}valid-rid-parameter</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>POST rid too early</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=split&amp;rid=$now.-50:T000000Z</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{http://calendarserver.org/ns/}invalid-split</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Event with count</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/simple/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>POST rid too late</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=split&amp;rid=$now.50:T000000Z</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{http://calendarserver.org/ns/}invalid-split</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Event non-recurring</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/simple/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>POST non-recurring</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=split&amp;rid=$now.-10:T000000Z</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{http://calendarserver.org/ns/}invalid-split</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Scheduled event, with per-organizer/per-attendee data'>
+ <test name='1'>
+ <description>Organizer invites Attendee (with alarm and override)</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/implicit/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/implicit/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/implicit/3.ics</value>
+ </arg>
+ </verify>
+ <graburi>$attendee1:</graburi>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Attendee -> Accepted with alarm</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PUT</method>
+ <ruri>$attendee1:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/implicit/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Organizer Inbox Item</description>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Organizer data changed</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/implicit/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>POST to split</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=split&amp;rid=$now.0:T000000Z</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>totalcount</name>
+ <value>2</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}getetag</value>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>$multistatus-href-prefix:</name>
+ <variable>$href1:</variable>
+ <variable>$href2:</variable>
+ </grabelement>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$href2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabcalproperty>
+ <name>VEVENT/UID</name>
+ <variable>$olduid:</variable>
+ </grabcalproperty>
+ </request>
+ </test>
+ <test name='9'>
+ <description>GET new-part split (original) resource</description>
+ <request>
+ <method>GET</method>
+ <ruri>$href1:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/implicit/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>GET old-part split (new resource)</description>
+ <request>
+ <method>GET</method>
+ <ruri>$href2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/implicit/7.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>GET attendee new-part split (original) resource</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$attendee1:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/implicit/8.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <description>GET attendee old-part split (new resource)</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/implicit/9.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
</ins></span></pre></div>
<a id="CalDAVTestertrunksrccaldavtestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/caldavtest.py (12279 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/caldavtest.py 2014-01-10 03:39:29 UTC (rev 12279)
+++ CalDAVTester/trunk/src/caldavtest.py 2014-01-10 15:30:43 UTC (rev 12280)
</span><span class="lines">@@ -521,6 +521,8 @@
</span><span class="cx"> elif req.method == "GETNEW":
</span><span class="cx"> collection = (req.ruri, req.user, req.pswd)
</span><span class="cx"> self.grabbedlocation = self.dofindnew(collection, label=label)
</span><ins>+ if req.graburi:
+ self.manager.server_info.addextrasubs({req.graburi: self.grabbedlocation})
</ins><span class="cx"> req.method = "GET"
</span><span class="cx"> req.ruri = "$"
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>