[CalendarServer-changes] [5386] CalDAVTester/branches/users/cdaboo/sharing-5228

source_changes at macosforge.org source_changes at macosforge.org
Tue Mar 23 15:40:37 PDT 2010


Revision: 5386
          http://trac.macosforge.org/projects/calendarserver/changeset/5386
Author:   cdaboo at apple.com
Date:     2010-03-23 15:40:37 -0700 (Tue, 23 Mar 2010)
Log Message:
-----------
Adjust tests for per-user data.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/auto6/suite6/2.ics
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/auto6/suite6/3.ics
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics
    CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics
    CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/attachments.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/get.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitauto1.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitauto6.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/put.xml

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/auto6/suite6/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/auto6/suite6/2.ics	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/auto6/suite6/2.ics	2010-03-23 22:40:37 UTC (rev 5386)
@@ -15,60 +15,4 @@
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060105T000000Z
-DTEND:20060105T010000Z
-RECURRENCE-ID:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/auto6/suite6/3.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/auto6/suite6/3.ics	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/auto6/suite6/3.ics	2010-03-23 22:40:37 UTC (rev 5386)
@@ -15,60 +15,4 @@
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060101T000000Z
-DTEND:20060101T010000Z
-RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060102T000000Z
-DTEND:20060102T010000Z
-RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060103T000000Z
-DTEND:20060103T010000Z
-RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:event-2
-DTSTART:20060105T000000Z
-DTEND:20060105T010000Z
-RECURRENCE-ID:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
-CREATED:20060110T231240Z
-DESCRIPTION:Call-in
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:Blocking event - 2
-TRANSP:OPAQUE
-END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/1.ics	2010-03-23 22:40:37 UTC (rev 5386)
@@ -36,7 +36,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/2.ics	2010-03-23 22:40:37 UTC (rev 5386)
@@ -38,7 +38,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/3.ics	2010-03-23 22:40:37 UTC (rev 5386)
@@ -37,7 +37,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/4.ics	2010-03-23 22:40:37 UTC (rev 5386)
@@ -38,7 +38,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/5.ics	2010-03-23 22:40:37 UTC (rev 5386)
@@ -38,7 +38,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics	2010-03-23 22:40:37 UTC (rev 5386)
@@ -38,7 +38,7 @@
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20090330T150000
-DURATION:PT1H
+DURATION:PT2H
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/attachments.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/attachments.xml	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/attachments.xml	2010-03-23 22:40:37 UTC (rev 5386)
@@ -45,15 +45,11 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
-					<callback>dataString</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
-						<name>contains</name>
-						<value>ATTACH;FMTTYPE=image/jpeg;ENCODING=BASE64;VALUE=BINARY:</value>
+						<name>filepath</name>
+						<value>Resource/CalDAV/attachments/1.ics</value>
 					</arg>
-					<arg>
-						<name>contains</name>
-						<value>RQAUUUUAFFFFAH//2Q==</value>
-					</arg>
 				</verify>
 			</request>
 		</test>
@@ -74,15 +70,11 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
-					<callback>dataString</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
-						<name>contains</name>
-						<value>ATTACH;FMTTYPE=image/jpeg;ENCODING=BASE64;VALUE=BINARY:</value>
+						<name>filepath</name>
+						<value>Resource/CalDAV/attachments/2.ics</value>
 					</arg>
-					<arg>
-						<name>contains</name>
-						<value>RQAUUUUAFFFFAH//2Q==</value>
-					</arg>
 				</verify>
 			</request>
 		</test>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/get.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/get.xml	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/get.xml	2010-03-23 22:40:37 UTC (rev 5386)
@@ -54,7 +54,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/delete/1.txt</value>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitauto1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitauto1.xml	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitauto1.xml	2010-03-23 22:40:37 UTC (rev 5386)
@@ -77,8 +77,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -220,12 +220,12 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
-			<description>Two items in user01 Inbox</description>
+			<description>One items in user01 Inbox</description>
 			<request print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
@@ -356,8 +356,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -492,8 +492,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -628,8 +628,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -764,8 +764,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -900,8 +900,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitauto6.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitauto6.xml	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitauto6.xml	2010-03-23 22:40:37 UTC (rev 5386)
@@ -57,8 +57,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -157,8 +157,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -257,8 +257,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -357,8 +357,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -557,8 +557,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/put.xml	2010-03-23 21:17:01 UTC (rev 5385)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/put.xml	2010-03-23 22:40:37 UTC (rev 5386)
@@ -44,7 +44,7 @@
 					<callback>header</callback>
 					<arg>
 						<name>header</name>
-						<value>ETag$\"08eb5966e4065cbadcb41da00bfae5f1\"</value>
+						<value>ETag</value>
 					</arg>
 				</verify>
 			</request>
@@ -52,7 +52,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/recurrenceput/1.txt</value>
@@ -77,7 +77,7 @@
 				<method>GET</method>
 				<ruri>$pathprefix1:/1.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/recurrenceput/1.txt</value>
@@ -105,7 +105,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/1todo.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/todo/1.txt</value>
@@ -130,7 +130,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/2todo.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/todo/2.txt</value>
@@ -155,7 +155,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/3todo.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/todo/3.txt</value>
@@ -180,7 +180,7 @@
 				<method>GET</method>
 				<ruri>$calendarpath1:/4todo.ics</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CalDAV/todo/4.txt</value>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100323/1a2f7726/attachment-0001.html>


More information about the calendarserver-changes mailing list