[CalendarServer-changes] [12543] CalDAVTester/trunk/Resource

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:22:30 PDT 2014 

Revision: 12543
          http://trac.calendarserver.org//changeset/12543
Author:   cdaboo at apple.com
Date:     2014-02-03 11:52:23 -0800 (Mon, 03 Feb 2014)
Log Message:
-----------
Use proper variable for calendar path.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/aclreports/19.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/1.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/2.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/3.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/4.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/5.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/6.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/7.txt
    CalDAVTester/trunk/Resource/CalDAV/reports/multiget/8.xml
    CalDAVTester/trunk/Resource/CalDAV/scheduleacl/2.xml
    CalDAVTester/trunk/Resource/CardDAV/bulk/simple/12.xml
    CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/aclreports/19.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/aclreports/19.xml	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/aclreports/19.xml	2014-02-03 19:52:23 UTC (rev 12543)
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <multistatus xmlns='DAV:'>
   <response>
-    <href>$calendarhome1:/calendar/1.ics</href>
+    <href>$calendarpath1:/1.ics</href>
     <propstat>
       <prop>
         <supported-report-set>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/1.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/1.txt	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/1.txt	2014-02-03 19:52:23 UTC (rev 12543)
@@ -9,10 +9,10 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$calendarhome1:/calendar/1.ics</D:href>
-<D:href>$calendarhome1:/calendar/2.ics</D:href>
-<D:href>$calendarhome1:/calendar/3.ics</D:href>
-<D:href>$calendarhome1:/calendar/4.ics</D:href>
-<D:href>$calendarhome1:/calendar/101.ics</D:href>
-<D:href>$calendarhome1:/calendar/102.ics</D:href>
+<D:href>$calendarpath1:/1.ics</D:href>
+<D:href>$calendarpath1:/2.ics</D:href>
+<D:href>$calendarpath1:/3.ics</D:href>
+<D:href>$calendarpath1:/4.ics</D:href>
+<D:href>$calendarpath1:/101.ics</D:href>
+<D:href>$calendarpath1:/102.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/2.txt	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/2.txt	2014-02-03 19:52:23 UTC (rev 12543)
@@ -8,8 +8,8 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$calendarhome1:/calendar/1.ics</D:href>
-<D:href>$calendarhome1:/calendar/2.ics</D:href>
-<D:href>$calendarhome1:/calendar/3.ics</D:href>
-<D:href>$calendarhome1:/calendar/4.ics</D:href>
+<D:href>$calendarpath1:/1.ics</D:href>
+<D:href>$calendarpath1:/2.ics</D:href>
+<D:href>$calendarpath1:/3.ics</D:href>
+<D:href>$calendarpath1:/4.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/3.txt	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/3.txt	2014-02-03 19:52:23 UTC (rev 12543)
@@ -12,8 +12,8 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$calendarhome1:/calendar/1.ics</D:href>
-<D:href>$calendarhome1:/calendar/2.ics</D:href>
-<D:href>$calendarhome1:/calendar/3.ics</D:href>
-<D:href>$calendarhome1:/calendar/4.ics</D:href>
+<D:href>$calendarpath1:/1.ics</D:href>
+<D:href>$calendarpath1:/2.ics</D:href>
+<D:href>$calendarpath1:/3.ics</D:href>
+<D:href>$calendarpath1:/4.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/4.txt	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/4.txt	2014-02-03 19:52:23 UTC (rev 12543)
@@ -13,10 +13,10 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$calendarhome1:/calendar/1.ics</D:href>
-<D:href>$calendarhome1:/calendar/2.ics</D:href>
-<D:href>$calendarhome1:/calendar/3.ics</D:href>
-<D:href>$calendarhome1:/calendar/4.ics</D:href>
-<D:href>$calendarhome1:/calendar/101.ics</D:href>
-<D:href>$calendarhome1:/calendar/102.ics</D:href>
+<D:href>$calendarpath1:/1.ics</D:href>
+<D:href>$calendarpath1:/2.ics</D:href>
+<D:href>$calendarpath1:/3.ics</D:href>
+<D:href>$calendarpath1:/4.ics</D:href>
+<D:href>$calendarpath1:/101.ics</D:href>
+<D:href>$calendarpath1:/102.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/5.txt	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/5.txt	2014-02-03 19:52:23 UTC (rev 12543)
@@ -13,10 +13,10 @@
 </C:comp>
 </C:calendar-data>
 </D:prop>
-<D:href>$calendarhome1:/calendar/1.ics</D:href>
-<D:href>$calendarhome1:/calendar/2.ics</D:href>
-<D:href>$calendarhome1:/calendar/3.ics</D:href>
-<D:href>$calendarhome1:/calendar/4.ics</D:href>
-<D:href>$calendarhome1:/calendar/101.ics</D:href>
-<D:href>$calendarhome1:/calendar/102.ics</D:href>
+<D:href>$calendarpath1:/1.ics</D:href>
+<D:href>$calendarpath1:/2.ics</D:href>
+<D:href>$calendarpath1:/3.ics</D:href>
+<D:href>$calendarpath1:/4.ics</D:href>
+<D:href>$calendarpath1:/101.ics</D:href>
+<D:href>$calendarpath1:/102.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/6.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/6.txt	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/6.txt	2014-02-03 19:52:23 UTC (rev 12543)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:allprop/>
-<D:href>$calendarhome1:/calendar/1.ics</D:href>
-<D:href>$calendarhome1:/calendar/2.ics</D:href>
-<D:href>$calendarhome1:/calendar/3.ics</D:href>
-<D:href>$calendarhome1:/calendar/4.ics</D:href>
+<D:href>$calendarpath1:/1.ics</D:href>
+<D:href>$calendarpath1:/2.ics</D:href>
+<D:href>$calendarpath1:/3.ics</D:href>
+<D:href>$calendarpath1:/4.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/7.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/7.txt	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/7.txt	2014-02-03 19:52:23 UTC (rev 12543)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:propname/>
-<D:href>$calendarhome1:/calendar/1.ics</D:href>
-<D:href>$calendarhome1:/calendar/2.ics</D:href>
-<D:href>$calendarhome1:/calendar/3.ics</D:href>
-<D:href>$calendarhome1:/calendar/4.ics</D:href>
+<D:href>$calendarpath1:/1.ics</D:href>
+<D:href>$calendarpath1:/2.ics</D:href>
+<D:href>$calendarpath1:/3.ics</D:href>
+<D:href>$calendarpath1:/4.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/multiget/8.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/multiget/8.xml	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/multiget/8.xml	2014-02-03 19:52:23 UTC (rev 12543)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:propname/>
-<D:href>$calendarhome1:/calendar/bogus-resource.ics</D:href>
+<D:href>$calendarpath1:/bogus-resource.ics</D:href>
 </C:calendar-multiget>

Modified: CalDAVTester/trunk/Resource/CalDAV/scheduleacl/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/scheduleacl/2.xml	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CalDAV/scheduleacl/2.xml	2014-02-03 19:52:23 UTC (rev 12543)
@@ -2,7 +2,7 @@
 <D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:set>
 <D:prop>
-<C:calendar-free-busy-set><D:href>$calendarhome1:/calendar/</D:href></C:calendar-free-busy-set>
+<C:calendar-free-busy-set><D:href>$calendarpath1:/</D:href></C:calendar-free-busy-set>
 </D:prop>
 </D:set>
 </D:propertyupdate>

Modified: CalDAVTester/trunk/Resource/CardDAV/bulk/simple/12.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/12.xml	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CardDAV/bulk/simple/12.xml	2014-02-03 19:52:23 UTC (rev 12543)
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <multistatus xmlns='DAV:'>
   <response>
-    <href>/addressbooks/__uids__/user01/addressbook/45aad6d69d91e1e6e37c9fd1d38b950d.vcf</href>
+    <href>$addressbookpath1:/45aad6d69d91e1e6e37c9fd1d38b950d.vcf</href>
     <propstat>
       <prop>
         <getetag>"c9c80708eda258e871b3e6f02e6383d8"</getetag>

Modified: CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml	2014-02-03 19:45:54 UTC (rev 12542)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml	2014-02-03 19:52:23 UTC (rev 12543)
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <multistatus xmlns='DAV:'>
   <response>
-    <href>$calendarhome1:/calendar/1.ics</href>
+    <href>$calendarpath1:/1.ics</href>
     <propstat>
       <prop>
         <supported-report-set>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/1f834d7e/attachment.html>

More information about the calendarserver-changes mailing list