[CalendarServer-changes] [2527] CalDAVTester/branches/users/cdaboo/server2server-2525
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jun 3 13:45:26 PDT 2008
Revision: 2527
http://trac.macosforge.org/projects/calendarserver/changeset/2527
Author: cdaboo at apple.com
Date: 2008-06-03 13:45:25 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
Merged from trunk.
Modified Paths:
--------------
CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/server/serverinfo.xml
CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/acl.xml
CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/schedulepost.xml
Added Paths:
-----------
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/1.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/2.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/3.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/4.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/5.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/6.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/7.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/8.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/9.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/servertoserverincoming.xml
CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/servertoserveroutgoing.xml
Removed Paths:
-------------
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/1.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/2.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/3.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/4.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/5.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/6.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/7.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/8.ics
CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/9.ics
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver)
Deleted: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/1.ics 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/1.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -1,31 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20051222T205953Z
-CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-SUMMARY:event 1
-UID:1234 at example.com-1
-END:VEVENT
-END:VCALENDAR
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/1.ics (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/1.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/1.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/1.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:1234 at example.com-1
+END:VEVENT
+END:VCALENDAR
Deleted: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/2.ics 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/2.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -1,31 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20051222T205953Z
-CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:20060101T120000
-DURATION:PT1H
-SUMMARY:event 2
-UID:1234 at example.com-2
-END:VEVENT
-END:VCALENDAR
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/2.ics (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/2.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/2.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/2.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+SUMMARY:event 2
+UID:1234 at example.com-2
+END:VEVENT
+END:VCALENDAR
Deleted: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/3.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/3.ics 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/3.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -1,14 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VFREEBUSY
-UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=Remote 01:mailto:remote01 at calendarserver.org
-ATTENDEE;CN=User 01:$cuaddr1:
-DTSTART:20060101T000000Z
-DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
-END:VFREEBUSY
-END:VCALENDAR
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/3.ics (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/3.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/3.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/3.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=Remote 01:mailto:remote01 at calendarserver.org
+ATTENDEE;CN=User 01:$cuaddr1:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060103T000000Z
+END:VFREEBUSY
+END:VCALENDAR
Deleted: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/4.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/4.ics 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/4.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -1,14 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VFREEBUSY
-UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-DTSTART:20060101T000000Z
-DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
-END:VFREEBUSY
-END:VCALENDAR
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/4.ics (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/4.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/4.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/4.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02:$cuaddr2:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060103T000000Z
+END:VFREEBUSY
+END:VCALENDAR
Deleted: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/5.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/5.ics 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/5.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -1,19 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:20060110T231240Z-4011c71-187-6f73-1
-DTSTART:20060208T200000Z
-DTEND:20060208T210000Z
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-CREATED:20060110T231240Z
-DESCRIPTION:+1 605 990 0100\nAccess: 879307#
-DTSTAMP:20060309T185105Z
-REQUEST-STATUS:2.0\; Success.
-STATUS:CONFIRMED
-SUMMARY:TC Realtime
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/5.ics (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/5.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/5.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/5.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REPLY
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:20060110T231240Z-4011c71-187-6f73-1
+DTSTART:20060208T200000Z
+DTEND:20060208T210000Z
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02:$cuaddr2:
+CREATED:20060110T231240Z
+DESCRIPTION:+1 605 990 0100\nAccess: 879307#
+DTSTAMP:20060309T185105Z
+REQUEST-STATUS:2.0\; Success.
+STATUS:CONFIRMED
+SUMMARY:TC Realtime
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Deleted: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/6.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/6.ics 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/6.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -1,18 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REQUEST
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:20060110T231240Z-4011c71-187-6f73-1
-DTSTART:20060102T200000Z
-DTEND:20060102T210000Z
-ATTENDEE;CN=User 01:$cuaddr1:
-CREATED:20060110T231240Z
-DESCRIPTION:+1 605 990 0100\nAccess: 879307#
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Remote 01:mailto:remote01 at calendarserver.org
-STATUS:CONFIRMED
-SUMMARY:TC Realtime
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/6.ics (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/6.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/6.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/6.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REQUEST
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:20060110T231240Z-4011c71-187-6f73-1
+DTSTART:20060102T200000Z
+DTEND:20060102T210000Z
+ATTENDEE;CN=User 01:$cuaddr1:
+CREATED:20060110T231240Z
+DESCRIPTION:+1 605 990 0100\nAccess: 879307#
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=Remote 01:mailto:remote01 at calendarserver.org
+STATUS:CONFIRMED
+SUMMARY:TC Realtime
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Deleted: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/7.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/7.ics 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/7.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -1,19 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REQUEST
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:20060110T231240Z-4011c71-187-6f73-1
-DTSTART:20060102T220000Z
-DTEND:20060102T230000Z
-ATTENDEE;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-CREATED:20060110T231240Z
-DESCRIPTION:+1 605 990 0100\nAccess: 879307#
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=Remote 01:mailto:remote01 at calendarserver.org
-STATUS:CONFIRMED
-SUMMARY:TC Realtime
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/7.ics (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/7.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/7.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/7.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REQUEST
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:20060110T231240Z-4011c71-187-6f73-1
+DTSTART:20060102T220000Z
+DTEND:20060102T230000Z
+ATTENDEE;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02:$cuaddr2:
+CREATED:20060110T231240Z
+DESCRIPTION:+1 605 990 0100\nAccess: 879307#
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=Remote 01:mailto:remote01 at calendarserver.org
+STATUS:CONFIRMED
+SUMMARY:TC Realtime
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Deleted: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/8.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/8.ics 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/8.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -1,14 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VFREEBUSY
-UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=Remote 01:mailto:remote01 at example.org
-DTSTART:20060101T000000Z
-DTSTAMP:20060309T185105Z
-DTEND:20060103T000000Z
-END:VFREEBUSY
-END:VCALENDAR
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/8.ics (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/8.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/8.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/8.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=Remote 01:mailto:remote01 at example.org
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060103T000000Z
+END:VFREEBUSY
+END:VCALENDAR
Deleted: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/9.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/9.ics 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/9.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -1,18 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REQUEST
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:20060110T231240Z-4011c71-187-6f73-1
-DTSTART:20060102T200000Z
-DTEND:20060102T210000Z
-ATTENDEE;CN=Remote 01:mailto:remote01 at calendarserver.org
-CREATED:20060110T231240Z
-DESCRIPTION:+1 605 990 0100\nAccess: 879307#
-DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddr1:
-STATUS:CONFIRMED
-SUMMARY:TC Realtime
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/9.ics (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/Resource/servertoserver/9.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/9.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/Resource/servertoserver/9.ics 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REQUEST
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:20060110T231240Z-4011c71-187-6f73-1
+DTSTART:20060102T200000Z
+DTEND:20060102T210000Z
+ATTENDEE;CN=Remote 01:mailto:remote01 at calendarserver.org
+CREATED:20060110T231240Z
+DESCRIPTION:+1 605 990 0100\nAccess: 879307#
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=User 01:$cuaddr1:
+STATUS:CONFIRMED
+SUMMARY:TC Realtime
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/server/serverinfo.xml 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/server/serverinfo.xml 2008-06-03 20:45:25 UTC (rev 2527)
@@ -84,6 +84,12 @@
<value>outbox</value>
</substitution>
+ <!-- server-to-server inbox-->
+ <substitution>
+ <key>$servertoserver:</key>
+ <value>/inbox</value>
+ </substitution>
+
<!-- user id for admin user -->
<substitution>
<key>$useradmin:</key>
Modified: CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/acl.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/acl.xml 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/acl.xml 2008-06-03 20:45:25 UTC (rev 2527)
@@ -341,6 +341,7 @@
<value/>
<value>visibletouser01/</value>
<value>writeabletouser01/</value>
+ <value>freebusy</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/schedulepost.xml 2008-06-03 19:00:34 UTC (rev 2526)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/schedulepost.xml 2008-06-03 20:45:25 UTC (rev 2527)
@@ -96,7 +96,7 @@
<request print-response="no">
<method>POST</method>
<header>
- <name>Organizer</name>
+ <name>Originator</name>
<value>$cuaddr1:</value>
</header>
<header>
@@ -122,7 +122,7 @@
<request>
<method>POST</method>
<header>
- <name>Organizer</name>
+ <name>Originator</name>
<value>$cuaddr1:</value>
</header>
<header>
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/servertoserverincoming.xml (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/scripts/tests/servertoserverincoming.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/servertoserverincoming.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/servertoserverincoming.xml 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,416 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ DRI: Cyrus Daboo, cdaboo at apple.com
+ -->
+
+<caldavtest ignore-all="yes">
+ <description>Test POST method in CalDAV</description>
+
+ <start>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$pathprefix:/$outbox:/</ruri>
+ </request>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$pathprefix:/$inbox:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$pathprefix2:/$outbox:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
+ </request>
+ <request end-delete="yes">
+ <method>PUT</method>
+ <ruri>$pathprefix:/calendar/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/1.ics</filepath>
+ </data>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" end-delete="yes">
+ <method>PUT</method>
+ <ruri>$pathprefix2:/calendar/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/2.ics</filepath>
+ </data>
+ </request>
+ </start>
+
+ <test-suite name="POST free-busy" ignore='no'>
+ <test name='1'>
+ <description>POST free busy one valid user</description>
+ <request auth='no' print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>mailto:remote01 at calendarserver.org</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST free busy two valid users</description>
+ <request auth='no' print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>mailto:remote01 at calendarserver.org</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr1:,$cuaddr2:</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H</value>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T170000Z/PT1H</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name="POST invite one user" ignore='no'>
+ <test name='1'>
+ <description>POST invite to one valid user</description>
+ <request auth='no' print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>mailto:remote01 at calendarserver.org</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/6.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>2.0;Success</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>One item in user01 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>GETNEW</method>
+ <ruri>$pathprefix:/$inbox:/</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/servertoserver/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name="POST invite two users" ignore='no'>
+ <test name='1'>
+ <description>POST invite to two valid users</description>
+ <request auth='no' print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>mailto:remote01 at calendarserver.org</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr1:, $cuaddr2:</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/7.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>2.0;Success</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>One item in user01 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>GETNEW</method>
+ <ruri>$pathprefix:/$inbox:/</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/servertoserver/7.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>One item in user02 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>GETNEW</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/servertoserver/7.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name="POST Errors" ignore='no'>
+ <test name='1'>
+ <description>POST authenticated</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>mailto:remote01 at calendarserver.org</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr2:</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST local originator</description>
+ <request auth='no' print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr2:</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>urn:ietf:params:xml:ns:caldavoriginator-allowed</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>POST invalid local recipient</description>
+ <request auth='no' print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>mailto:remote01 at calendarserver.org</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>mailto:bogus at example.com</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>3.7;Invalid Calendar User</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>POST remote recipient</description>
+ <request auth='no' print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>mailto:remote01 at calendarserver.org</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>mailto:remote02 at calendarserver.org</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>3.7;Invalid Calendar User</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>POST local organizer</description>
+ <request auth='no' print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>mailto:remote01 at calendarserver.org</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr2:</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>urn:ietf:params:xml:ns:caldavorganizer-allowed</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>POST local attendee reply</description>
+ <request auth='no' print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>mailto:remote01 at calendarserver.org</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <ruri>$servertoserver:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$pathprefix:/$outbox:/</ruri>
+ </request>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$pathprefix:/$inbox:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$pathprefix2:/$outbox:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
+ </request>
+ </end>
+
+</caldavtest>
Copied: CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/servertoserveroutgoing.xml (from rev 2526, CalDAVTester/branches/users/cdaboo/server2server-2408/scripts/tests/servertoserveroutgoing.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/servertoserveroutgoing.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/server2server-2525/scripts/tests/servertoserveroutgoing.xml 2008-06-03 20:45:25 UTC (rev 2527)
@@ -0,0 +1,94 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ DRI: Cyrus Daboo, cdaboo at apple.com
+ -->
+
+<caldavtest ignore-all="yes">
+ <description>Test POST method in CalDAV</description>
+
+ <start/>
+
+ <test-suite name="POST free-busy" ignore='no'>
+ <test name='1'>
+ <description>POST free busy one valid user</description>
+ <request print-response='yes'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>mailto:remote01 at example.org</value>
+ </header>
+ <ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>2.0;Success</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name="POST invite" ignore='no'>
+ <test name='1'>
+ <description>POST invite one valid user</description>
+ <request print-response='yes'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>mailto:remote01 at example.org</value>
+ </header>
+ <ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/servertoserver/9.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>2.0;Success</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080603/55a565b0/attachment-0001.htm
More information about the calendarserver-changes
mailing list