<!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>[10789] CalDAVTester/branches/users/gaya/sharedgroupstester</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/10789">10789</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2013-02-21 17:43:35 -0800 (Thu, 21 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>complete last merge</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVimplicitpartstattimestampxml">CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/implicitpartstattimestamp.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentsimplicitxml">CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-implicit.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentsquotaxml">CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-quota.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentsrecurrencexml">CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-recurrence.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentssharingxml">CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-sharing.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentsxml">CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVtimezonestdservicexml">CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/timezonestdservice.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstestersrcjsonPointerpy">CalDAVTester/branches/users/gaya/sharedgroupstester/src/jsonPointer.py</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstestersrcunittest__init__py">CalDAVTester/branches/users/gaya/sharedgroupstester/src/unittest/__init__.py</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterverifiersjsonPointerMatchpy">CalDAVTester/branches/users/gaya/sharedgroupstester/verifiers/jsonPointerMatch.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/</li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentsdropbox1xml">CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/1.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentsdropbox2xml">CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/2.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentsdropbox3ics">CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/3.ics</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentsdropbox4txt">CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/4.txt</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentssharing4xml">CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/4.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentssharing5xml">CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/5.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentssharing6xml">CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/6.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentsdropbox1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/1.xml (0 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/1.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/1.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:A="http://calendarserver.org/ns/">
+<D:prop>
+<A:dropbox-home-URL/>
+</D:prop>
+</D:propfind>
</ins></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentsdropbox2xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/2.xml (0 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/2.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/2.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+</D:prop>
+</D:propfind>
</ins></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentsdropbox3ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/3.ics (0 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/3.ics (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/3.ics 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:put-1@example.com
+DTSTART:$now.year.1:0101T120000Z
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentsdropbox4txt"></a>
<div class="addfile"><h4>Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/4.txt (0 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/4.txt (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/dropbox/4.txt 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This is a text file being used
+as a test of managed attachment
+support in calendarserver.
</ins></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentssharing4xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/4.xml (0 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/4.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/4.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri2:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentssharing5xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/5.xml (0 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/5.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/5.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri3:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterResourceCalDAVmanagedattachmentssharing6xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/6.xml (0 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/6.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CalDAV/managedattachments/sharing/6.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set/>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVimplicitpartstattimestampxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/implicitpartstattimestamp.xml (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/implicitpartstattimestamp.xml 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/implicitpartstattimestamp.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
</span><span class="cx">
</span><span class="cx"> <!--
</span><del>- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
</del><ins>+ Copyright (c) 2006-2013 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> you may not use this file except in compliance with the License.
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentsimplicitxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-implicit.xml (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-implicit.xml 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-implicit.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
</span><span class="cx">
</span><span class="cx"> <!--
</span><del>- Copyright (c) 2012 Apple Inc. All rights reserved.
</del><ins>+ Copyright (c) 2012-2013 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> you may not use this file except in compliance with the License.
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -687,7 +687,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -912,14 +912,14 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='8' ignore='no'>
</del><ins>+ <test name='12' ignore='no'>
</ins><span class="cx"> <description>Remove attachment</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarpath1:/1.ics?action=attachment-remove&amp;managed-id=$managed_id2:</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="lines">@@ -930,7 +930,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9'>
</del><ins>+ <test name='13'>
</ins><span class="cx"> <description>Attendee Inbox Item</description>
</span><span class="cx"> <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="lines">@@ -955,7 +955,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='10'>
</del><ins>+ <test name='14'>
</ins><span class="cx"> <description>Attendee has data</description>
</span><span class="cx"> <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</span><span class="cx"> <method>GETNEW</method>
</span><span class="lines">@@ -969,7 +969,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11' ignore='no'>
</del><ins>+ <test name='15' ignore='no'>
</ins><span class="cx"> <description>Check access to attachment</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -978,7 +978,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -986,10 +986,10 @@
</span><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$attach2:</ruri>
</span><span class="cx"> <verify>
</span><del>- <callback>prepostcondition</callback>
</del><ins>+ <callback>statusCode</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>error</name>
- <value>{DAV:}need-privileges</value>
</del><ins>+ <name>status</name>
+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -1075,7 +1075,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1159,7 +1159,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1317,7 +1317,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1393,7 +1393,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>prepostcondition</callback>
</span><span class="lines">@@ -1496,7 +1496,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1589,7 +1589,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentsquotaxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-quota.xml (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-quota.xml 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-quota.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
</span><span class="cx">
</span><span class="cx"> <!--
</span><del>- Copyright (c) 2012 Apple Inc. All rights reserved.
</del><ins>+ Copyright (c) 2012-2013 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> you may not use this file except in compliance with the License.
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentsrecurrencexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-recurrence.xml (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-recurrence.xml 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-recurrence.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
</span><span class="cx">
</span><span class="cx"> <!--
</span><del>- Copyright (c) 2012 Apple Inc. All rights reserved.
</del><ins>+ Copyright (c) 2012-2013 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> you may not use this file except in compliance with the License.
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -275,13 +275,17 @@
</span><span class="cx"> <value>Cal-Managed-ID$$managed-id:</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><ins>+ <grabheader>
+ <name>Location</name>
+ <variable>$location2:</variable>
+ </grabheader>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='5' ignore='no'>
</span><span class="cx"> <description>Check for attachment</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$location:</ruri>
</del><ins>+ <ruri>$location2:</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>dataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -310,11 +314,25 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><ins>+ <test name='8' ignore='no'>
+ <description>Check for attachment</description>
+ <request>
+ <method>GET</method>
+ <ruri>$location2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <end/>
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentssharingxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-sharing.xml (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-sharing.xml 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments-sharing.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
</span><span class="cx">
</span><span class="cx"> <!--
</span><del>- Copyright (c) 2012 Apple Inc. All rights reserved.
</del><ins>+ Copyright (c) 2012-2013 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> you may not use this file except in compliance with the License.
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> <ruri>$calendarhome1:/shared/1.ics?action=attachment-remove&amp;managed-id=$managed-id:</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -271,10 +271,10 @@
</span><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$location:</ruri>
</span><span class="cx"> <verify>
</span><del>- <callback>prepostcondition</callback>
</del><ins>+ <callback>statusCode</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>error</name>
- <value>{DAV:}need-privileges</value>
</del><ins>+ <name>status</name>
+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -282,10 +282,10 @@
</span><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$location:</ruri>
</span><span class="cx"> <verify>
</span><del>- <callback>prepostcondition</callback>
</del><ins>+ <callback>statusCode</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>error</name>
- <value>{DAV:}need-privileges</value>
</del><ins>+ <name>status</name>
+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -296,10 +296,10 @@
</span><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$location:</ruri>
</span><span class="cx"> <verify>
</span><del>- <callback>prepostcondition</callback>
</del><ins>+ <callback>statusCode</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>error</name>
- <value>{DAV:}need-privileges</value>
</del><ins>+ <name>status</name>
+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> <ruri>$sharedcalendar3:/1.ics?action=attachment-remove&amp;managed-id=$managed-id:</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>prepostcondition</callback>
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx"> <ruri>$sharedcalendar2:/1.ics?action=attachment-remove&amp;managed-id=$managed-id:</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -537,10 +537,10 @@
</span><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$location:</ruri>
</span><span class="cx"> <verify>
</span><del>- <callback>prepostcondition</callback>
</del><ins>+ <callback>statusCode</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>error</name>
- <value>{DAV:}need-privileges</value>
</del><ins>+ <name>status</name>
+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -548,10 +548,10 @@
</span><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$location:</ruri>
</span><span class="cx"> <verify>
</span><del>- <callback>prepostcondition</callback>
</del><ins>+ <callback>statusCode</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>error</name>
- <value>{DAV:}need-privileges</value>
</del><ins>+ <name>status</name>
+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -562,10 +562,10 @@
</span><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$location:</ruri>
</span><span class="cx"> <verify>
</span><del>- <callback>prepostcondition</callback>
</del><ins>+ <callback>statusCode</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>error</name>
- <value>{DAV:}need-privileges</value>
</del><ins>+ <name>status</name>
+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -748,7 +748,7 @@
</span><span class="cx"> <ruri>$sharedcalendar2:/2.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -922,7 +922,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1106,7 +1106,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -1154,7 +1154,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1331,6 +1331,383 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><ins>+ <test-suite name='Direct share' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>Add user02 as read write for user01</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/managedattachments/sharing/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>Add user03 as read write for user01</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/managedattachments/sharing/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Sharees do direct share</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarhome1:/shared/?action=share</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$sharedcalendar2:</variable>
+ </grabelement>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarhome1:/shared/?action=share</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$sharedcalendar3:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>PUT event</description>
+ <request end-delete='no'>
+ <method>PUT</method>
+ <ruri>$calendarhome1:/shared/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/managedattachments/sharing/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarhome1:/shared/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/managedattachments/sharing/1.ics</value>
+ </arg>
+ </verify>
+ <grabheader>
+ <name>ETag</name>
+ <variable>$etag:</variable>
+ </grabheader>
+ </request>
+ </test>
+ <test name='5' ignore='no'>
+ <description>Read-only sharee cannot add attachment</description>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>POST</method>
+ <ruri>$sharedcalendar3:/1.ics?action=attachment-add</ruri>
+ <header>
+ <name>Content-Disposition</name>
+ <value>attachment;filename=test.txt</value>
+ </header>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <data>
+ <content-type>text/plain</content-type>
+ <filepath>Resource/CalDAV/managedattachments/sharing/2.txt</filepath>
+ </data>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{DAV:}need-privileges</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6' ignore='no'>
+ <description>Sharee can add attachment</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$sharedcalendar2:/1.ics?action=attachment-add</ruri>
+ <header>
+ <name>Content-Disposition</name>
+ <value>attachment;filename=test.txt</value>
+ </header>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <data>
+ <content-type>text/plain</content-type>
+ <filepath>Resource/CalDAV/managedattachments/sharing/2.txt</filepath>
+ </data>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/managedattachments/sharing/1.ics</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>ATTACH</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>unwrap</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>contains</name>
+ <value>ATTACH</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>Cal-Managed-ID</value>
+ </arg>
+ </verify>
+ <grabheader>
+ <name>Location</name>
+ <variable>$location:</variable>
+ </grabheader>
+ <grabheader>
+ <name>Cal-Managed-ID</name>
+ <variable>$managed-id:</variable>
+ </grabheader>
+ </request>
+ </test>
+ <test name='7' ignore='no'>
+ <description>Check for attachment - sharer</description>
+ <request>
+ <method>GET</method>
+ <ruri>$location:</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/managedattachments/simple/2.txt</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8' ignore='no'>
+ <description>Check for attachment - sharees</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$location:</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/managedattachments/simple/2.txt</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>GET</method>
+ <ruri>$location:</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/managedattachments/simple/2.txt</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9' ignore='no'>
+ <description>Check for attachment - non sharee</description>
+ <request user="$userid4:" pswd="$pswd4:">
+ <method>GET</method>
+ <ruri>$location:</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{DAV:}need-privileges</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10' ignore='no'>
+ <description>Read-only sharee cannot remove attachment</description>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>POST</method>
+ <ruri>$sharedcalendar3:/1.ics?action=attachment-remove&amp;managed-id=$managed-id:</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{DAV:}need-privileges</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11' ignore='no'>
+ <description>Sharee remove attachment</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$sharedcalendar2:/1.ics?action=attachment-remove&amp;managed-id=$managed-id:</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/managedattachments/simple/1.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='12' ignore='no'>
+ <description>Check for attachment - sharer</description>
+ <request>
+ <method>GET</method>
+ <ruri>$location:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='13' ignore='no'>
+ <description>Check for attachment - sharees</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$location:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>GET</method>
+ <ruri>$location:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='14' ignore='no'>
+ <description>Check for attachment - non sharee</description>
+ <request user="$userid4:" pswd="$pswd4:">
+ <method>GET</method>
+ <ruri>$location:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='15' ignore='no'>
+ <description>Delete calendar data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$sharedcalendar2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>DELETE</method>
+ <ruri>$sharedcalendar3:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/shared/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='16' ignore='no'>
+ <description>Clear user02 as read-write proxy for user01</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/managedattachments/sharing/6.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='17' ignore='no'>
+ <description>Clear user03 as read-only proxy for user01</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/managedattachments/sharing/6.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
</ins><span class="cx"> <end>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVmanagedattachmentsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments.xml (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments.xml 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/managed-attachments.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
</span><span class="cx">
</span><span class="cx"> <!--
</span><del>- Copyright (c) 2012 Apple Inc. All rights reserved.
</del><ins>+ Copyright (c) 2012-2013 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> you may not use this file except in compliance with the License.
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.ics?action=attachment-remove&amp;managed-id=$managed-id:</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -687,7 +687,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -762,7 +762,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="lines">@@ -789,7 +789,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -813,7 +813,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -861,7 +861,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -940,7 +940,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>prepostcondition</callback>
</span><span class="lines">@@ -1026,7 +1026,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -1074,7 +1074,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1149,7 +1149,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1189,13 +1189,17 @@
</span><span class="cx"> <value>Cal-Managed-ID$$managed-id:</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><ins>+ <grabheader>
+ <name>Location</name>
+ <variable>$location2:</variable>
+ </grabheader>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='5' ignore='no'>
</span><span class="cx"> <description>Check for attachment</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$location:</ruri>
</del><ins>+ <ruri>$location2:</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>dataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -1224,11 +1228,25 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><ins>+ <test name='8' ignore='no'>
+ <description>Check for attachment</description>
+ <request>
+ <method>GET</method>
+ <ruri>$location2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='Simple non-recurring, non-scheduled update attachment invalid'>
</span><span class="lines">@@ -1272,7 +1290,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1351,7 +1369,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1441,7 +1459,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -1477,7 +1495,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -1507,7 +1525,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1598,7 +1616,7 @@
</span><span class="cx"> <ruri>$calendarpath2:/2.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -1692,7 +1710,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -1707,7 +1725,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -1737,7 +1755,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1828,7 +1846,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/2.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -1911,7 +1929,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -1944,13 +1962,17 @@
</span><span class="cx"> <value>;MANAGED-ID=$managed_id1:</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><ins>+ <grabheader>
+ <name>Location</name>
+ <variable>$location2:</variable>
+ </grabheader>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7' ignore='no'>
</span><span class="cx"> <description>Check for attachment</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$attach1:</ruri>
</del><ins>+ <ruri>$location2:</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>dataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -2017,11 +2039,25 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><ins>+ <test name='13' ignore='no'>
+ <description>Check for attachment</description>
+ <request>
+ <method>GET</method>
+ <ruri>$location2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='Simple non-recurring, non-scheduled add attachment on update - invalid managed-id'>
</span><span class="lines">@@ -2067,7 +2103,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -2097,7 +2133,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -2188,7 +2224,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/2.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -2214,7 +2250,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/2.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -2240,6 +2276,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>notcontains</name>
</span><span class="cx"> <value>;MANAGED-ID=$managed_id1:</value>
</span><ins>+ <value>None</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabheader>
</span><span class="lines">@@ -2293,7 +2330,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -2317,7 +2354,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -2379,7 +2416,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -2394,7 +2431,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -2424,7 +2461,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/plain</content-type>
</span><span class="lines">@@ -2515,7 +2552,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <header>
</span><span class="cx"> <name>Prefer</name>
</span><del>- <value>return-representation</value>
</del><ins>+ <value>return=representation</value>
</ins><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -2563,7 +2600,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>403</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterscriptstestsCalDAVtimezonestdservicexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/timezonestdservice.xml (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/timezonestdservice.xml 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CalDAV/timezonestdservice.xml 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
</span><span class="cx">
</span><span class="cx"> <!--
</span><del>- Copyright (c) 2006-2012 Apple Inc. All rights reserved.
</del><ins>+ Copyright (c) 2006-2013 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> you may not use this file except in compliance with the License.
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstestersrcjsonPointerpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/src/jsonPointer.py (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/src/jsonPointer.py 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/src/jsonPointer.py 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2012 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2012-2013 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstestersrcunittest__init__py"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/src/unittest/__init__.py (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/src/unittest/__init__.py 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/src/unittest/__init__.py 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2012 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2012-2013 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupstesterverifiersjsonPointerMatchpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/verifiers/jsonPointerMatch.py (10788 => 10789)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupstester/verifiers/jsonPointerMatch.py 2013-02-22 01:39:48 UTC (rev 10788)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/verifiers/jsonPointerMatch.py 2013-02-22 01:43:35 UTC (rev 10789)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2010 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2010-2013 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span></span></pre>
</div>
</div>
</body>
</html>