<!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>[13714] 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/13714">13714</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 12:59:58 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean-up and fix various cross-pod tests. Include a test for cross-pod freebusy by proxies.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVpodcalendaruserproxy3ics">CalDAVTester/trunk/Resource/CalDAV-pod/calendaruserproxy/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVpodsharingcommonnotificationdecline2xml">CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationdecline2.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVpodsharingcommonnotificationreply2xml">CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationreply2.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfopodxml">CalDAVTester/trunk/scripts/server/serverinfo-pod.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVcalendaruserproxyxml">CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVimplicitproxyxml">CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVimplicitsimplexml">CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVsharingcachexml">CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalDAVTester/trunk/Resource/CalDAV-pod/calendaruserproxy/</li>
<li>CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVpodimplicitproxy16ics">CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/16.ics</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV-pod/implicitschedule/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>CalDAVTester/trunk/Resource/CalDAV/podding/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVpodcalendaruserproxy3ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV-pod/calendaruserproxy/3.ics (13706 => 13714)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/podding/calendaruserproxy/3.ics 2014-06-30 14:57:51 UTC (rev 13706)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/calendaruserproxy/3.ics 2014-07-02 19:59:58 UTC (rev 13714)
</span><span class="lines">@@ -8,6 +8,6 @@
</span><span class="cx"> DTSTART:$now.year.1:0101T100000Z
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> SUMMARY:event 2
</span><del>-UID:$uid1:
</del><ins>+UID:$uid2:
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVpodimplicitproxy16ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/16.ics (0 => 13714)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/16.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/16.ics 2014-07-02 19:59:58 UTC (rev 13714)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:$uid1:
+DTSTART:$now.year.1:0208T000000Z
+DTEND:$now.year.1:0209T000000Z
+ATTENDEE;CN=$username2::$cuaddralt2:
+ATTENDEE;CN=$username3::$cuaddralt3:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username2::$cuaddralt2:
+END:VFREEBUSY
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVpodsharingcommonnotificationdecline2xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationdecline2.xml (13713 => 13714)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationdecline2.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationdecline2.xml 2014-07-02 19:59:58 UTC (rev 13714)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
</span><span class="cx"> <dtstamp></dtstamp>
</span><del>- <invite-reply xmlns='http://calendarserver.org/ns/'>
</del><ins>+ <invite-reply shared-type="calendar" xmlns='http://calendarserver.org/ns/'>
</ins><span class="cx"> <href xmlns='DAV:'>mailto:$pemail2:</href>
</span><span class="cx"> <invite-declined/>
</span><span class="cx"> <hosturl>
</span><span class="lines">@@ -8,7 +8,5 @@
</span><span class="cx"> </hosturl>
</span><span class="cx"> <in-reply-to>$inviteuid2:</in-reply-to>
</span><span class="cx"> <common-name>$pusername2:</common-name>
</span><del>- <first-name>$pfirstname2:</first-name>
- <last-name>$plastname2:</last-name>
</del><span class="cx"> </invite-reply>
</span><span class="cx"> </notification>
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVpodsharingcommonnotificationreply2xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationreply2.xml (13713 => 13714)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationreply2.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationreply2.xml 2014-07-02 19:59:58 UTC (rev 13714)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
</span><span class="cx"> <dtstamp></dtstamp>
</span><del>- <invite-reply xmlns='http://calendarserver.org/ns/'>
</del><ins>+ <invite-reply shared-type="calendar" xmlns='http://calendarserver.org/ns/'>
</ins><span class="cx"> <href xmlns='DAV:'>mailto:$pemail2:</href>
</span><span class="cx"> <invite-accepted/>
</span><span class="cx"> <hosturl>
</span><span class="lines">@@ -9,7 +9,5 @@
</span><span class="cx"> <in-reply-to>$inviteuid2:</in-reply-to>
</span><span class="cx"> <summary>The Shared Calendar</summary>
</span><span class="cx"> <common-name>$pusername2:</common-name>
</span><del>- <first-name>$pfirstname2:</first-name>
- <last-name>$plastname2:</last-name>
</del><span class="cx"> </invite-reply>
</span><span class="cx"> </notification>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfopodxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml (13713 => 13714)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-07-02 19:59:58 UTC (rev 13714)
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> <!-- user guid -->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$puserguid%d:</key>
</span><del>- <value>puser%02d</value>
</del><ins>+ <value>60000000-0000-0000-0000-000000000%03d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- user name -->
</span><span class="cx"> <substitution>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestspodCalDAVcalendaruserproxyxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml (13713 => 13714)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml 2014-07-02 19:59:58 UTC (rev 13714)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/2.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/podding/calendaruserproxy/3.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.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/podding/calendaruserproxy/5.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/5.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/2.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/podding/calendaruserproxy/3.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -617,7 +617,7 @@
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -715,7 +715,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/2.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/podding/calendaruserproxy/3.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -752,7 +752,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -775,7 +775,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -831,7 +831,7 @@
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -850,7 +850,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -873,7 +873,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -896,7 +896,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -929,7 +929,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.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/podding/calendaruserproxy/5.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/5.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -943,7 +943,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/2.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/podding/calendaruserproxy/3.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -957,7 +957,7 @@
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -976,7 +976,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -999,7 +999,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1022,7 +1022,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1062,7 +1062,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1085,7 +1085,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1118,7 +1118,7 @@
</span><span class="cx"> <ruri>$pprincipal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/6.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/6.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1137,7 +1137,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -1160,7 +1160,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1183,7 +1183,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -1216,7 +1216,7 @@
</span><span class="cx"> <ruri>$pcalendarpath1:/2.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/podding/calendaruserproxy/3.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -1234,7 +1234,7 @@
</span><span class="cx"> <ruri>$pprincipal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1253,7 +1253,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1276,7 +1276,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1299,7 +1299,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1332,7 +1332,7 @@
</span><span class="cx"> <ruri>$pprincipal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/6.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/6.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1351,7 +1351,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -1374,7 +1374,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1397,7 +1397,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -1430,7 +1430,7 @@
</span><span class="cx"> <ruri>$pcalendarpath1:/1.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/podding/calendaruserproxy/5.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/5.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -1444,7 +1444,7 @@
</span><span class="cx"> <ruri>$pcalendarpath1:/2.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/podding/calendaruserproxy/3.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -1458,7 +1458,7 @@
</span><span class="cx"> <ruri>$pprincipal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1477,7 +1477,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1500,7 +1500,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1523,7 +1523,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1563,7 +1563,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1586,7 +1586,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1619,7 +1619,7 @@
</span><span class="cx"> <ruri>$pprincipal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/6.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/6.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1638,7 +1638,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -1661,7 +1661,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1684,7 +1684,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -1717,7 +1717,7 @@
</span><span class="cx"> <ruri>$pcalendarpath1:/2.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/podding/calendaruserproxy/3.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -1735,7 +1735,7 @@
</span><span class="cx"> <ruri>$pprincipal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1754,7 +1754,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1777,7 +1777,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1800,7 +1800,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1833,7 +1833,7 @@
</span><span class="cx"> <ruri>$pprincipal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/6.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/6.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1852,7 +1852,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -1875,7 +1875,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1898,7 +1898,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlElementMatch</callback>
</span><span class="lines">@@ -1931,7 +1931,7 @@
</span><span class="cx"> <ruri>$pcalendarpath1:/1.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/podding/calendaruserproxy/5.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/5.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -1945,7 +1945,7 @@
</span><span class="cx"> <ruri>$pcalendarpath1:/2.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/podding/calendaruserproxy/3.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -1959,7 +1959,7 @@
</span><span class="cx"> <ruri>$pprincipal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -1978,7 +1978,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -2001,7 +2001,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -2024,7 +2024,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestspodCalDAVimplicitproxyxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml (13713 => 13714)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml 2014-07-02 19:59:58 UTC (rev 13714)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> <ruri>$principal2:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> <request user="$userid3:" pswd="$pswd3:">
</span><span class="lines">@@ -53,11 +53,28 @@
</span><span class="cx"> <ruri>$principal3:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><span class="cx">
</span><ins>+ <test-suite name='Proxy free busy as Organizer'>
+ <test name='1'>
+ <description>Proxy does freebusy request</description>
+ <request host2='yes' user='$puserid1:' pswd='$ppswd1:'>
+ <method>POST</method>
+ <ruri>$outboxpath2:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/implicitproxy/16.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
</ins><span class="cx"> <test-suite name='Proxy as Organizer'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Proxy creates new event</description>
</span><span class="lines">@@ -66,7 +83,7 @@
</span><span class="cx"> <ruri>$calendarpath2:/1.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/podding/implicitproxy/3.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/3.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -84,7 +101,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="lines">@@ -104,7 +121,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitproxy/5.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitproxy/5.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -125,13 +142,45 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitproxy/6.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitproxy/6.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-suite>
</span><span class="cx">
</span><ins>+ <test-suite name='Proxy free busy as Organizer'>
+ <test name='1'>
+ <description>Proxy does freebusy request</description>
+ <request host2='yes' user='$puserid1:' pswd='$ppswd1:'>
+ <method>POST</method>
+ <ruri>$outboxpath2:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/implicitproxy/16.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddralt2:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0208T200000Z/$now.year.1:0208T210000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddralt3:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
</ins><span class="cx"> <test-suite name='Proxy as Attendee'>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Proxy updates event</description>
</span><span class="lines">@@ -147,7 +196,7 @@
</span><span class="cx"> <ruri>$</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/7.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/7.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -170,7 +219,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitproxy/8.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitproxy/8.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -186,7 +235,7 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/4.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="lines">@@ -206,13 +255,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/podding/implicitproxy/9.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitproxy/9.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-suite>
</span><span class="cx">
</span><ins>+ <test-suite name='Proxy free busy as Organizer'>
+ <test name='1'>
+ <description>Proxy does freebusy request</description>
+ <request host2='yes' user='$puserid1:' pswd='$ppswd1:'>
+ <method>POST</method>
+ <ruri>$outboxpath2:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/implicitproxy/16.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddralt2:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0208T200000Z/$now.year.1:0208T210000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddralt3:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0208T200000Z/$now.year.1:0208T210000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
</ins><span class="cx"> <test-suite name="Undo proxy">
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Remove proxy</description>
</span><span class="lines">@@ -221,7 +306,7 @@
</span><span class="cx"> <ruri>$principal2:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -232,7 +317,7 @@
</span><span class="cx"> <ruri>$principal3:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -288,7 +373,7 @@
</span><span class="cx"> <ruri>$principal2:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> <request user="$userid3:" pswd="$pswd3:">
</span><span class="lines">@@ -296,7 +381,7 @@
</span><span class="cx"> <ruri>$principal3:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="lines">@@ -304,7 +389,7 @@
</span><span class="cx"> <ruri>$calendarpath2:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/11.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/11.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> <request user="$userid3:" pswd="$pswd3:">
</span><span class="lines">@@ -312,7 +397,7 @@
</span><span class="cx"> <ruri>$calendarpath3:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitproxy/11.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitproxy/11.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> </end>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestspodCalDAVimplicitsimplexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml (13713 => 13714)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml 2014-07-02 19:59:58 UTC (rev 13714)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.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/podding/implicitschedule/suite1/1.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/1.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/2.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/2.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/3.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/3.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/3.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/3.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> <ruri>$</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/4.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/4.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/5.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/5.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/6.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/6.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> <ruri>$</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/7.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/7.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/8.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/8.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -252,22 +252,31 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/9.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/9.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='18'>
</del><ins>+ <test name='-1'>
</ins><span class="cx"> <description>Clean-up</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$calendarpath1:/</ruri>
</span><span class="cx"> <ruri>$inboxpath1:/</ruri>
</span><del>- <ruri>$calendarpath2:/</ruri>
</del><ins>+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
</ins><span class="cx"> <ruri>$inboxpath2:/</ruri>
</span><del>- <ruri>$pcalendarpath1:/</ruri>
</del><ins>+ </request>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>WAITDELETEALL 1</method>
</ins><span class="cx"> <ruri>$pinboxpath1:/</ruri>
</span><span class="cx"> </request>
</span><ins>+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$pcalendarpath1:/</ruri>
+ </request>
</ins><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="lines">@@ -279,7 +288,7 @@
</span><span class="cx"> <ruri>$calendarpath1:/1.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/podding/implicitschedule/suite1/1.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/1.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -295,7 +304,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/2.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/2.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -320,7 +329,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/3.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/3.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -331,7 +340,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/3.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/3.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -350,7 +359,7 @@
</span><span class="cx"> <ruri>$</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/4.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/4.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -373,7 +382,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/5.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/5.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -409,7 +418,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/6.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/6.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -428,7 +437,7 @@
</span><span class="cx"> <ruri>$</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/7.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/7.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -451,7 +460,7 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/8.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/8.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -487,35 +496,34 @@
</span><span class="cx"> <callback>calendarDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/podding/implicitschedule/suite1/9.ics</value>
</del><ins>+ <value>Resource/CalDAV-pod/implicitschedule/suite1/9.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='18'>
</del><ins>+ <test name='-1'>
</ins><span class="cx"> <description>Clean-up</description>
</span><span class="cx"> <request host2='yes' user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$calendarpath1:/</ruri>
</span><span class="cx"> <ruri>$inboxpath1:/</ruri>
</span><del>- <ruri>$calendarpath2:/</ruri>
</del><ins>+ </request>
+ <request host2='yes' user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
</ins><span class="cx"> <ruri>$inboxpath2:/</ruri>
</span><del>- <ruri>$pcalendarpath1:/</ruri>
</del><ins>+ </request>
+ <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
+ <method>WAITDELETEALL 1</method>
</ins><span class="cx"> <ruri>$pinboxpath1:/</ruri>
</span><span class="cx"> </request>
</span><ins>+ <request host2='yes' user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$pcalendarpath1:/</ruri>
+ </request>
</ins><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <end>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- <ruri>$pcalendarpath1:/</ruri>
- <ruri>$pinboxpath1:/</ruri>
- </request>
- </end>
</del><ins>+ <end/>
</ins><span class="cx">
</span><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestspodCalDAVsharingcachexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml (13713 => 13714)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml 2014-07-02 19:59:58 UTC (rev 13714)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> <callback>dataString</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>notcontains</name>
</span><del>- <value>user02</value>
</del><ins>+ <value>$puserguid2:</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> <callback>dataString</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>contains</name>
</span><del>- <value>puser02</value>
</del><ins>+ <value>$puserguid2:</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> <callback>dataString</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>notcontains</name>
</span><del>- <value>puser02</value>
</del><ins>+ <value>$puserguid2:</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span></span></pre>
</div>
</div>
</body>
</html>