[CalendarServer-changes] [11175] CalDAVTester/branches/users/gaya/sharedgroupstester-2

source_changes at macosforge.org source_changes at macosforge.org
Mon May 13 18:48:52 PDT 2013


Revision: 11175
          http://trac.calendarserver.org//changeset/11175
Author:   gaya at apple.com
Date:     2013-05-13 18:48:52 -0700 (Mon, 13 May 2013)
Log Message:
-----------
merge up to 11174

Modified Paths:
--------------
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/default-alarms/properties/2.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/odsetup.py
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV/bulk.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV/copymove.xml

Added Paths:
-----------
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/1.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/2.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/3.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/4.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/5.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/6.ics

Removed Paths:
-------------
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/1.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/2.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/3.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/4.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/5.ics
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/6.ics

Property Changed:
----------------
    CalDAVTester/branches/users/gaya/sharedgroupstester-2/


Property changes on: CalDAVTester/branches/users/gaya/sharedgroupstester-2
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
/CalDAVTester/trunk:11139-11149
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
/CalDAVTester/trunk:11138-11165

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/default-alarms/properties/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/default-alarms/properties/2.xml	2013-05-13 21:05:58 UTC (rev 11174)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/default-alarms/properties/2.xml	2013-05-14 01:48:52 UTC (rev 11175)
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:prop>
-    <C:default-alarm-vevent-datetime><![CDATA[BEGIN:VALARM
-UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
-DESCRIPTION:Event reminder
-TRIGGER:-PT15M
-ACTION:DISPLAY
-END:VALARM
-]]></C:default-alarm-vevent-datetime>
+    <C:default-alarm-vevent-datetime/>
 </D:prop>
 </D:propfind>

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/1.ics	2013-05-10 21:19:00 UTC (rev 11165)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/1.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -1,35 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//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:$now.year.1:0101T100000
-DURATION:PT1H
-SUMMARY:event 1
-UID:event1 at ninevah.local
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/1.ics (from rev 11165, CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/1.ics)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/1.ics	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/1.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at ninevah.local
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/2.ics	2013-05-10 21:19:00 UTC (rev 11165)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/2.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -1,35 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-CREATED:20060101T150000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:event 1
-X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/2.ics (from rev 11165, CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/2.ics)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/2.ics	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/2.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/3.ics	2013-05-10 21:19:00 UTC (rev 11165)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/3.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -1,36 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
-CREATED:20060101T150000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:event 1
-TRANSP:TRANSPARENT
-X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/3.ics (from rev 11165, CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/3.ics)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/3.ics	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/3.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/4.ics	2013-05-10 21:19:00 UTC (rev 11165)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/4.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -1,34 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
-CREATED:20060101T151000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1::$cuaddr1:
-SUMMARY:event 1
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/4.ics (from rev 11165, CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/4.ics)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/4.ics	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/4.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T151000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/5.ics	2013-05-10 21:19:00 UTC (rev 11165)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/5.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -1,35 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-CREATED:20060101T150000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
-SUMMARY:event 1
-X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/5.ics (from rev 11165, CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/5.ics)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/5.ics	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/5.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+SUMMARY:event 1
+X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
+END:VEVENT
+END:VCALENDAR

Deleted: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/6.ics	2013-05-10 21:19:00 UTC (rev 11165)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/6.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -1,35 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
-BEGIN:VTIMEZONE
-TZID:US/Eastern
-LAST-MODIFIED:20040110T032845Z
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:event1 at ninevah.local
-DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-CREATED:20060101T150000Z
-DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SUMMARY:event 1
-X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
-END:VEVENT
-END:VCALENDAR

Copied: CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/6.ics (from rev 11165, CalDAVTester/trunk/Resource/CalDAV/implicit/publicproperties/6.ics)
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/6.ics	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CalDAV/implicit/publicproperties/6.ics	2013-05-14 01:48:52 UTC (rev 11175)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+X-APPLE-STRUCTURED-LOCATION;VALUE=URI:geo:40.443975,-79.946462
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-2/odsetup.py
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/odsetup.py	2013-05-13 21:05:58 UTC (rev 11174)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/odsetup.py	2013-05-14 01:48:52 UTC (rev 11175)
@@ -30,7 +30,9 @@
 import traceback
 import uuid
 import xml.parsers.expat
+
 sys_root = "/Applications/Server.app/Contents/ServerRoot"
+os.environ["PATH"] = "%s/usr/bin:%s" % (sys_root, os.environ["PATH"])
 conf_root = "/Library/Server/Calendar and Contacts/Config"
 
 diradmin_user = "admin"

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV/bulk.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV/bulk.xml	2013-05-13 21:05:58 UTC (rev 11174)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV/bulk.xml	2013-05-14 01:48:52 UTC (rev 11175)
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<!DOCTYPE CardDAVtest SYSTEM "CardDAVtest.dtd">
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
  Copyright (c) 2006-2013 Apple Inc. All rights reserved.

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV/copymove.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV/copymove.xml	2013-05-13 21:05:58 UTC (rev 11174)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV/copymove.xml	2013-05-14 01:48:52 UTC (rev 11175)
@@ -77,7 +77,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='COPY'>
+	<test-suite name='COPY' ignore="yes">
 		<test name='1'>
 			<description>COPY within same addressbook with different name</description>
 			<request end-delete="no" print-response="no">
@@ -140,7 +140,10 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4'>
+	</test-suite>
+	
+	<test-suite name="MOVE">
+		<test name='1'>
 			<description>MOVE within same addressbook to new resource</description>
 			<request print-response="no">
 				<method>MOVE</method>
@@ -158,7 +161,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5'>
+		<test name='2'>
 			<description>MOVE within same addressbook to existing resource with overwrite</description>
 			<request print-response="no">
 				<method>MOVE</method>
@@ -180,7 +183,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6'>
+		<test name='3'>
 			<description>MOVE within same addressbook to existing resource without overwrite</description>
 			<request print-response="no">
 				<method>MOVE</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130513/5ceb3122/attachment-0001.html>


More information about the calendarserver-changes mailing list