<!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>[11867] 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/11867">11867</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2013-11-01 11:01:40 -0700 (Fri, 01 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>No longer preserve attendee private comments.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVprivatecomments32ics">CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVprivatecomments35ics">CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVprivatecomments37ics">CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVprivatecommentsxml">CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVprivatecomments32ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics (11866 => 11867)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics        2013-11-01 01:17:25 UTC (rev 11866)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics        2013-11-01 18:01:40 UTC (rev 11867)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> CALSCALE:GREGORIAN
</span><del>-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</del><ins>+PRODID:-//Example Inc.//Example Calendar//EN
</ins><span class="cx"> BEGIN:VTIMEZONE
</span><span class="cx"> TZID:US/Eastern
</span><span class="cx"> LAST-MODIFIED:20040110T032845Z
</span><span class="lines">@@ -25,11 +25,10 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
</span><del>-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
</del><ins>+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><del>-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</del><ins>+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
</ins><span class="cx"> SUMMARY:event 3
</span><del>-X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
</del><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVprivatecomments35ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics (11866 => 11867)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics        2013-11-01 01:17:25 UTC (rev 11866)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics        2013-11-01 18:01:40 UTC (rev 11867)
</span><span class="lines">@@ -31,6 +31,6 @@
</span><span class="cx"> ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
</span><span class="cx"> SUMMARY:event 3
</span><span class="cx"> X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
</span><del>- ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
</del><ins>+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted.
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVprivatecomments37ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics (11866 => 11867)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics        2013-11-01 01:17:25 UTC (rev 11866)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics        2013-11-01 18:01:40 UTC (rev 11867)
</span><span class="lines">@@ -31,6 +31,6 @@
</span><span class="cx"> ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
</span><span class="cx"> SUMMARY:event 3
</span><span class="cx"> X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
</span><del>- ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
</del><ins>+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted.
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVprivatecommentsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml (11866 => 11867)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml        2013-11-01 01:17:25 UTC (rev 11866)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml        2013-11-01 18:01:40 UTC (rev 11867)
</span><span class="lines">@@ -1006,55 +1006,34 @@
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='8'>
</span><del>-                        <description>Attendee removes comment property entirely</description>
-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
-                                <method>GETNEW</method>
-                                <ruri>$calendarpath2:/</ruri>
-                                <verify>
-                                        <callback>statusCode</callback>
-                                </verify>
</del><ins>+                        <description>Organizer Inbox Item</description>
+                        <request print-response='no'>
+                                <method>WAITDELETEALL 1</method>
+                                <ruri>$inboxpath1:/</ruri>
</ins><span class="cx">                         </request>
</span><del>-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
-                                <method>PUT</method>
-                                <ruri>$</ruri>
-                                <data>
-                                        <content-type>text/calendar; charset=utf-8</content-type>
-                                        <filepath>Resource/CalDAV/privatecomments/31.ics</filepath>
-                                </data>
-                                <verify>
-                                        <callback>statusCode</callback>
-                                </verify>
-                        </request>
</del><span class="cx">                 </test>
</span><span class="cx">                 <test name='9'>
</span><del>-                        <description>Attendee has data with comment preserved</description>
-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
-                                <method>GETNEW</method>
-                                <ruri>$calendarpath2:/</ruri>
</del><ins>+                        <description>Organizer data changed</description>
+                        <request print-response='no'>
+                                <method>GET</method>
+                                <ruri>$calendarpath1:/3.ics</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>calendarDataMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>filepath</name>
</span><del>-                                                <value>Resource/CalDAV/privatecomments/32.ics</value>
</del><ins>+                                                <value>Resource/CalDAV/privatecomments/35.ics</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='10'>
</span><del>-                        <description>Attendee changes comment</description>
-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
-                                <method>GETNEW</method>
-                                <ruri>$calendarpath2:/</ruri>
-                                <verify>
-                                        <callback>statusCode</callback>
-                                </verify>
-                        </request>
-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+                        <description>Organizer removes comments entirely</description>
+                        <request print-response='no'>
</ins><span class="cx">                                 <method>PUT</method>
</span><del>-                                <ruri>$</ruri>
</del><ins>+                                <ruri>$calendarpath1:/3.ics</ruri>
</ins><span class="cx">                                 <data>
</span><span class="cx">                                         <content-type>text/calendar; charset=utf-8</content-type>
</span><del>-                                        <filepath>Resource/CalDAV/privatecomments/33.ics</filepath>
</del><ins>+                                        <filepath>Resource/CalDAV/privatecomments/36.ics</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="lines">@@ -1062,55 +1041,34 @@
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='11'>
</span><del>-                        <description>Attendee has data with comment preserved</description>
-                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
-                                <method>GETNEW</method>
-                                <ruri>$calendarpath2:/</ruri>
-                                <verify>
-                                        <callback>calendarDataMatch</callback>
-                                        <arg>
-                                                <name>filepath</name>
-                                                <value>Resource/CalDAV/privatecomments/34.ics</value>
-                                        </arg>
-                                </verify>
-                        </request>
-                </test>
-                <test name='12'>
-                        <description>Organizer Inbox Items</description>
</del><ins>+                        <description>Organizer checks data</description>
</ins><span class="cx">                         <request print-response='no'>
</span><del>-                                <method>WAITDELETEALL 2</method>
-                                <ruri>$inboxpath1:/</ruri>
-                        </request>
-                </test>
-                <test name='13'>
-                        <description>Organizer data changed</description>
-                        <request print-response='no'>
</del><span class="cx">                                 <method>GET</method>
</span><span class="cx">                                 <ruri>$calendarpath1:/3.ics</ruri>
</span><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>calendarDataMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>filepath</name>
</span><del>-                                                <value>Resource/CalDAV/privatecomments/35.ics</value>
</del><ins>+                                                <value>Resource/CalDAV/privatecomments/37.ics</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><del>-                <test name='15'>
-                        <description>Organizer removes comments entirely</description>
</del><ins>+                <test name='12'>
+                        <description>Organizer changes comment</description>
</ins><span class="cx">                         <request print-response='no'>
</span><span class="cx">                                 <method>PUT</method>
</span><span class="cx">                                 <ruri>$calendarpath1:/3.ics</ruri>
</span><span class="cx">                                 <data>
</span><span class="cx">                                         <content-type>text/calendar; charset=utf-8</content-type>
</span><del>-                                        <filepath>Resource/CalDAV/privatecomments/36.ics</filepath>
</del><ins>+                                        <filepath>Resource/CalDAV/privatecomments/38.ics</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><del>-                <test name='16'>
</del><ins>+                <test name='13'>
</ins><span class="cx">                         <description>Organizer checks data</description>
</span><span class="cx">                         <request print-response='no'>
</span><span class="cx">                                 <method>GET</method>
</span><span class="lines">@@ -1119,35 +1077,49 @@
</span><span class="cx">                                         <callback>calendarDataMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>filepath</name>
</span><del>-                                                <value>Resource/CalDAV/privatecomments/37.ics</value>
</del><ins>+                                                <value>Resource/CalDAV/privatecomments/38.ics</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><del>-                <test name='17'>
-                        <description>Organizer changes comment</description>
-                        <request print-response='no'>
</del><ins>+                <test name='14'>
+                        <description>Attendee removes comment property entirely</description>
+                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+                                <method>GETNEW</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</ins><span class="cx">                                 <method>PUT</method>
</span><del>-                                <ruri>$calendarpath1:/3.ics</ruri>
</del><ins>+                                <ruri>$</ruri>
</ins><span class="cx">                                 <data>
</span><span class="cx">                                         <content-type>text/calendar; charset=utf-8</content-type>
</span><del>-                                        <filepath>Resource/CalDAV/privatecomments/38.ics</filepath>
</del><ins>+                                        <filepath>Resource/CalDAV/privatecomments/31.ics</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><del>-                <test name='18'>
-                        <description>Organizer checks data</description>
</del><ins>+                <test name='15'>
+                        <description>Organizer Inbox Item</description>
</ins><span class="cx">                         <request print-response='no'>
</span><ins>+                                <method>WAITDELETEALL 1</method>
+                                <ruri>$inboxpath1:/</ruri>
+                        </request>
+                </test>
+                <test name='16'>
+                        <description>Organizer data changed</description>
+                        <request print-response='no'>
</ins><span class="cx">                                 <method>GET</method>
</span><span class="cx">                                 <ruri>$calendarpath1:/3.ics</ruri>
</span><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>calendarDataMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>filepath</name>
</span><del>-                                                <value>Resource/CalDAV/privatecomments/38.ics</value>
</del><ins>+                                                <value>Resource/CalDAV/privatecomments/32.ics</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span></span></pre>
</div>
</div>
</body>
</html>