[CalendarServer-changes] [3559] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Dec 19 12:23:54 PST 2008


Revision: 3559
          http://trac.macosforge.org/projects/calendarserver/changeset/3559
Author:   cdaboo at apple.com
Date:     2008-12-19 12:23:53 -0800 (Fri, 19 Dec 2008)
Log Message:
-----------
Merged normalize-cuaddr branch to trunk.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/availability/19.ics
    CalDAVTester/trunk/Resource/calendaruserproxy/13.ics
    CalDAVTester/trunk/Resource/calendaruserproxy/9.ics
    CalDAVTester/trunk/Resource/ctag/2.ics
    CalDAVTester/trunk/Resource/errors/35.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite1/1.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite1/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite2/1.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite2/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite3/1.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite3/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite4/1.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite4/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite4/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite4/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite5/1.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite5/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite5/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite5/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite6/1.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite6/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite6/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite6/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite7/1.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite7/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite7/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite7/4.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite1/1.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite2/1.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite3/1.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite4/1.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite4/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite4/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite5/1.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite5/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite5/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite6/1.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite6/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite6/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite7/1.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite7/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite7/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite8/1.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite8/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite8/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite1/1.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite2/1.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite3/1.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite4/1.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite4/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite4/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite5/1.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite5/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite5/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite6/1.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite6/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite6/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite7/1.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite7/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite7/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite8/1.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite8/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite8/3.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite1/1.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite2/1.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite3/1.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/1.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/2.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/4.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/5.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/6.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/7.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/8.ics
    CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/1.ics
    CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/2.ics
    CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/4.ics
    CalDAVTester/trunk/Resource/implicit/deletecalendar/2.ics
    CalDAVTester/trunk/Resource/implicit/deletecalendar/4.ics
    CalDAVTester/trunk/Resource/implicit/deletecalendar/5.ics
    CalDAVTester/trunk/Resource/implicit/deletecalendar/6.ics
    CalDAVTester/trunk/Resource/implicit/errors/1.ics
    CalDAVTester/trunk/Resource/implicit/errors/3.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/1.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/10.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/2.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/4.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/5.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/6.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/7.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/8.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/9.ics
    CalDAVTester/trunk/Resource/implicit/proxy/13.ics
    CalDAVTester/trunk/Resource/implicit/proxy/14.ics
    CalDAVTester/trunk/Resource/implicit/proxy/3.ics
    CalDAVTester/trunk/Resource/implicit/proxy/5.ics
    CalDAVTester/trunk/Resource/implicit/proxy/6.ics
    CalDAVTester/trunk/Resource/implicit/proxy/7.ics
    CalDAVTester/trunk/Resource/implicit/proxy/8.ics
    CalDAVTester/trunk/Resource/implicit/proxy/9.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override/1.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/1.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/10.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/11.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/12.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/13.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/14.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/15.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/16.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/4.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/5.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/6.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/7.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/8.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/9.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/1.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/10.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/11.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/12.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/13.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/14.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/8.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/9.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/1.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/1.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/8.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/1.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/1.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/10.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/11.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/8.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/9.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/1.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/10.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/8.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/9.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/10.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/11.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/12.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/15.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/16.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/18.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/19.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/3.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/4.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/5.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/6.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/7.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/8.ics
    CalDAVTester/trunk/Resource/nonascii/11.ics
    CalDAVTester/trunk/Resource/performance/schedule/1.ics
    CalDAVTester/trunk/Resource/performance/schedule/2.ics
    CalDAVTester/trunk/Resource/performance/schedule/3.ics
    CalDAVTester/trunk/Resource/performance/schedule/4.ics
    CalDAVTester/trunk/Resource/performance/schedule/5.ics
    CalDAVTester/trunk/Resource/performance/schedule/6.ics
    CalDAVTester/trunk/Resource/privatecomments/1.ics
    CalDAVTester/trunk/Resource/privatecomments/10.ics
    CalDAVTester/trunk/Resource/privatecomments/11.ics
    CalDAVTester/trunk/Resource/privatecomments/12.ics
    CalDAVTester/trunk/Resource/privatecomments/13.ics
    CalDAVTester/trunk/Resource/privatecomments/14.ics
    CalDAVTester/trunk/Resource/privatecomments/15.ics
    CalDAVTester/trunk/Resource/privatecomments/16.ics
    CalDAVTester/trunk/Resource/privatecomments/17.ics
    CalDAVTester/trunk/Resource/privatecomments/18.ics
    CalDAVTester/trunk/Resource/privatecomments/19.ics
    CalDAVTester/trunk/Resource/privatecomments/2.ics
    CalDAVTester/trunk/Resource/privatecomments/20.ics
    CalDAVTester/trunk/Resource/privatecomments/21.ics
    CalDAVTester/trunk/Resource/privatecomments/22.ics
    CalDAVTester/trunk/Resource/privatecomments/23.ics
    CalDAVTester/trunk/Resource/privatecomments/24.ics
    CalDAVTester/trunk/Resource/privatecomments/25.ics
    CalDAVTester/trunk/Resource/privatecomments/26.ics
    CalDAVTester/trunk/Resource/privatecomments/27.ics
    CalDAVTester/trunk/Resource/privatecomments/28.ics
    CalDAVTester/trunk/Resource/privatecomments/29.ics
    CalDAVTester/trunk/Resource/privatecomments/30.ics
    CalDAVTester/trunk/Resource/privatecomments/31.ics
    CalDAVTester/trunk/Resource/privatecomments/32.ics
    CalDAVTester/trunk/Resource/privatecomments/33.ics
    CalDAVTester/trunk/Resource/privatecomments/34.ics
    CalDAVTester/trunk/Resource/privatecomments/35.ics
    CalDAVTester/trunk/Resource/privatecomments/36.ics
    CalDAVTester/trunk/Resource/privatecomments/37.ics
    CalDAVTester/trunk/Resource/privatecomments/38.ics
    CalDAVTester/trunk/Resource/privatecomments/4.ics
    CalDAVTester/trunk/Resource/privatecomments/5.ics
    CalDAVTester/trunk/Resource/privatecomments/6.ics
    CalDAVTester/trunk/Resource/privatecomments/7.ics
    CalDAVTester/trunk/Resource/privatecomments/8.ics
    CalDAVTester/trunk/Resource/privatecomments/9.ics
    CalDAVTester/trunk/Resource/privateevents/28.xml
    CalDAVTester/trunk/Resource/privateevents/3.ics
    CalDAVTester/trunk/Resource/privateevents/38.ics
    CalDAVTester/trunk/Resource/privateevents/49.ics
    CalDAVTester/trunk/Resource/privateevents/50.ics
    CalDAVTester/trunk/Resource/schedule/17.txt
    CalDAVTester/trunk/Resource/schedule/18.txt
    CalDAVTester/trunk/Resource/schedule/19.ics
    CalDAVTester/trunk/Resource/schedule/2.txt
    CalDAVTester/trunk/Resource/schedule/20.ics
    CalDAVTester/trunk/Resource/schedule/21.ics
    CalDAVTester/trunk/Resource/schedule/22.ics
    CalDAVTester/trunk/Resource/schedule/23.ics
    CalDAVTester/trunk/Resource/schedule/3.txt
    CalDAVTester/trunk/Resource/schedule/4.txt
    CalDAVTester/trunk/Resource/schedule/5.txt
    CalDAVTester/trunk/Resource/schedule/6.txt
    CalDAVTester/trunk/Resource/scheduleacl/3.ics
    CalDAVTester/trunk/Resource/scheduleauto/1.ics
    CalDAVTester/trunk/Resource/scheduleauto/10.ics
    CalDAVTester/trunk/Resource/scheduleauto/11.ics
    CalDAVTester/trunk/Resource/scheduleauto/12.ics
    CalDAVTester/trunk/Resource/scheduleauto/13.ics
    CalDAVTester/trunk/Resource/scheduleauto/14.ics
    CalDAVTester/trunk/Resource/scheduleauto/15.ics
    CalDAVTester/trunk/Resource/scheduleauto/16.ics
    CalDAVTester/trunk/Resource/scheduleauto/17.ics
    CalDAVTester/trunk/Resource/scheduleauto/18.ics
    CalDAVTester/trunk/Resource/scheduleauto/19.ics
    CalDAVTester/trunk/Resource/scheduleauto/2.ics
    CalDAVTester/trunk/Resource/scheduleauto/20.ics
    CalDAVTester/trunk/Resource/scheduleauto/21.ics
    CalDAVTester/trunk/Resource/scheduleauto/3.ics
    CalDAVTester/trunk/Resource/scheduleauto/4.ics
    CalDAVTester/trunk/Resource/scheduleauto/5.ics
    CalDAVTester/trunk/Resource/scheduleauto/7.ics
    CalDAVTester/trunk/Resource/scheduleauto/8.ics
    CalDAVTester/trunk/Resource/scheduleauto/9.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/1.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/10.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/11.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/12.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/13.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/14.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/15.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/16.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/17.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/18.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/19.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/2.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/3.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/4.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/5.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/6.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/7.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/8.ics
    CalDAVTester/trunk/Resource/scheduleautorecurcancel/9.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/1.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/10.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/11.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/12.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/13.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/14.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/15.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/16.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/17.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/18.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/19.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/2.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/20.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/21.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/22.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/23.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/3.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/4.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/5.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/6.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/7.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/8.ics
    CalDAVTester/trunk/Resource/scheduleautorecurrequest/9.ics
    CalDAVTester/trunk/Resource/scheduleautorecurspecial/1.ics
    CalDAVTester/trunk/Resource/scheduleautorecurspecial/2.ics
    CalDAVTester/trunk/Resource/scheduleautorecurspecial/3.ics
    CalDAVTester/trunk/Resource/scheduleautorecurspecial/4.ics
    CalDAVTester/trunk/Resource/scheduleautorecurspecial/5.ics
    CalDAVTester/trunk/Resource/scheduleautorecurspecial/6.ics
    CalDAVTester/trunk/Resource/schedulemaskuid/10.ics
    CalDAVTester/trunk/Resource/schedulemaskuid/11.ics
    CalDAVTester/trunk/Resource/schedulemaskuid/3.ics
    CalDAVTester/trunk/Resource/schedulemaskuid/4.ics
    CalDAVTester/trunk/Resource/schedulemaskuid/5.ics
    CalDAVTester/trunk/Resource/schedulemaskuid/6.ics
    CalDAVTester/trunk/Resource/schedulemaskuid/7.ics
    CalDAVTester/trunk/Resource/schedulemaskuid/8.ics
    CalDAVTester/trunk/Resource/schedulemaskuid/9.ics
    CalDAVTester/trunk/Resource/schedulenormal/1.ics
    CalDAVTester/trunk/Resource/schedulenormal/4.ics
    CalDAVTester/trunk/Resource/servertoserver/3.ics
    CalDAVTester/trunk/Resource/servertoserver/4.ics
    CalDAVTester/trunk/Resource/servertoserver/5.ics
    CalDAVTester/trunk/Resource/servertoserver/6.ics
    CalDAVTester/trunk/Resource/servertoserver/7.ics
    CalDAVTester/trunk/Resource/servertoserver/8.ics
    CalDAVTester/trunk/Resource/servertoserver/9.ics
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.dtd
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/server/sslserverinfo.xml
    CalDAVTester/trunk/scripts/tests/acl.xml
    CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
    CalDAVTester/trunk/scripts/tests/implicitscenario1.xml
    CalDAVTester/trunk/scripts/tests/privateevents.xml
    CalDAVTester/trunk/scripts/tests/schedulepost.xml
    CalDAVTester/trunk/src/serverinfo.py
    CalDAVTester/trunk/src/xmlDefs.py

Property Changed:
----------------
    CalDAVTester/trunk/Resource/errors/1.xml
    CalDAVTester/trunk/Resource/errors/10.xml
    CalDAVTester/trunk/Resource/errors/11.xml
    CalDAVTester/trunk/Resource/errors/12.xml
    CalDAVTester/trunk/Resource/errors/13.xml
    CalDAVTester/trunk/Resource/errors/14.xml
    CalDAVTester/trunk/Resource/errors/15.xml
    CalDAVTester/trunk/Resource/errors/16.xml
    CalDAVTester/trunk/Resource/errors/17.xml
    CalDAVTester/trunk/Resource/errors/18.xml
    CalDAVTester/trunk/Resource/errors/19.xml
    CalDAVTester/trunk/Resource/errors/2.ics
    CalDAVTester/trunk/Resource/errors/20.xml
    CalDAVTester/trunk/Resource/errors/21.xml
    CalDAVTester/trunk/Resource/errors/22.xml
    CalDAVTester/trunk/Resource/errors/23.xml
    CalDAVTester/trunk/Resource/errors/24.xml
    CalDAVTester/trunk/Resource/errors/25.xml
    CalDAVTester/trunk/Resource/errors/26.xml
    CalDAVTester/trunk/Resource/errors/27.xml
    CalDAVTester/trunk/Resource/errors/28.ics
    CalDAVTester/trunk/Resource/errors/29.xml
    CalDAVTester/trunk/Resource/errors/3.ics
    CalDAVTester/trunk/Resource/errors/30.xml
    CalDAVTester/trunk/Resource/errors/31.xml
    CalDAVTester/trunk/Resource/errors/32.xml
    CalDAVTester/trunk/Resource/errors/4.ics
    CalDAVTester/trunk/Resource/errors/5.ics
    CalDAVTester/trunk/Resource/errors/6.ics
    CalDAVTester/trunk/Resource/errors/7.ics
    CalDAVTester/trunk/Resource/errors/8.ics
    CalDAVTester/trunk/Resource/errors/9.ics
    CalDAVTester/trunk/scripts/tests/implicitoptions.xml

Modified: CalDAVTester/trunk/Resource/availability/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/availability/19.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/availability/19.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1::$cuaddr1:
 DTSTART:20060102T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z

Modified: CalDAVTester/trunk/Resource/calendaruserproxy/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/calendaruserproxy/13.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/calendaruserproxy/13.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddralt2:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
+ORGANIZER;CN=$username1::$cuaddralt2:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$cuaddralt3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/calendaruserproxy/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/calendaruserproxy/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/calendaruserproxy/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
+ORGANIZER;CN=$username1::$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$cuaddralt3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/ctag/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/ctag/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/ctag/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,7 +27,7 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local-1
-ORGANIZER;CN=User 01:$cuaddr2:
-ATTENDEE;CN=User 02:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr2:
+ATTENDEE;CN=$username2::$cuaddr1:
 END:VEVENT
 END:VCALENDAR


Property changes on: CalDAVTester/trunk/Resource/errors/1.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/1.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/1.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/1.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/1.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/1.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/1.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/1.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/1.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/1.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/10.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/10.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/10.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/10.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/10.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/10.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/10.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/10.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/10.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/10.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/11.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/11.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/11.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/11.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/11.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/11.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/11.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/11.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/11.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/11.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/12.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/12.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/12.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/12.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/12.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/12.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/12.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/12.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/12.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/12.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/13.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/13.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/13.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/13.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/13.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/13.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/13.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/13.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/13.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/13.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/14.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/14.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/14.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/14.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/14.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/14.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/14.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/14.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/14.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/14.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/15.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/15.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/15.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/15.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/15.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/15.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/15.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/15.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/15.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/15.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/16.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/16.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/16.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/16.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/16.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/16.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/16.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/16.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/16.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/16.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/17.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/17.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/17.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/17.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/17.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/17.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/17.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/17.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/17.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/17.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/18.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/18.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/18.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/18.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/18.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/18.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/18.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/18.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/18.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/18.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/19.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/19.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/19.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/19.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/19.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/19.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/19.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/19.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/19.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/19.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/2.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/2.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/2.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/2.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/2.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/2.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/2.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/2.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/2.ics:3534-3558
/CalDAVTester/trunk/Resource/errors/2.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/20.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/20.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/20.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/20.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/20.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/20.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/20.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/20.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/20.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/20.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/21.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/21.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/21.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/21.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/21.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/21.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/21.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/21.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/21.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/21.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/22.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/22.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/22.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/22.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/22.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/22.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/22.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/22.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/22.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/22.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/23.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/23.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/23.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/23.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/23.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/23.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/23.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/23.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/23.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/23.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/24.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/24.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/24.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/24.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/24.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/24.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/24.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/24.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/24.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/24.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/25.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/25.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/25.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/25.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/25.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/25.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/25.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/25.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/25.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/25.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/26.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/26.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/26.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/26.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/26.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/26.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/26.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/26.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/26.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/26.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/27.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/27.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/27.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/27.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/27.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/27.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/27.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/27.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/27.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/27.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/28.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/28.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/28.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/28.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/28.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/28.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/28.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/28.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/28.ics:3534-3558
/CalDAVTester/trunk/Resource/errors/28.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/29.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/29.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/29.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/29.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/29.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/29.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/29.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/29.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/29.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/29.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/3.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/3.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/3.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/3.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/3.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/3.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/3.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/3.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/3.ics:3534-3558
/CalDAVTester/trunk/Resource/errors/3.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/30.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/30.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/30.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/30.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/30.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/30.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/30.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/30.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/30.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/30.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/31.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/31.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/31.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/31.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/31.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/31.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/31.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/31.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/31.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/31.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/32.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/32.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/32.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/32.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/32.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/32.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/32.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/32.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/32.xml:3534-3558
/CalDAVTester/trunk/Resource/errors/32.txt:3142

Modified: CalDAVTester/trunk/Resource/errors/35.ics
===================================================================
--- CalDAVTester/trunk/Resource/errors/35.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/errors/35.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,9 +5,9 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:urn:uuid:bogus-uuid
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::urn:uuid:bogus-uuid
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060102T000000Z


Property changes on: CalDAVTester/trunk/Resource/errors/4.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/4.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/4.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/4.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/4.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/4.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/4.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/4.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/4.ics:3534-3558
/CalDAVTester/trunk/Resource/errors/4.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/5.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/5.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/5.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/5.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/5.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/5.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/5.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/5.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/5.ics:3534-3558
/CalDAVTester/trunk/Resource/errors/5.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/6.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/6.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/6.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/6.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/6.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/6.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/6.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/6.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/6.ics:3534-3558
/CalDAVTester/trunk/Resource/errors/6.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/7.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/7.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/7.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/7.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/7.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/7.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/7.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/7.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/7.ics:3534-3558
/CalDAVTester/trunk/Resource/errors/7.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/8.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/8.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/8.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/8.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/8.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/8.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/8.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/8.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/8.ics:3534-3558
/CalDAVTester/trunk/Resource/errors/8.txt:3142


Property changes on: CalDAVTester/trunk/Resource/errors/9.ics
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/9.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/9.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/9.txt:2949-2989
/CalDAVTester/trunk/Resource/errors/9.txt:3142
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/errors/9.txt:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/errors/9.txt:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/errors/9.txt:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/errors/9.ics:3534-3558
/CalDAVTester/trunk/Resource/errors/9.txt:3142

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite1/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite1/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite1/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite1/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,14 +5,14 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite1/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite1/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite1/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite1/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,14 +5,14 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite2/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite2/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185106Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite2/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite2/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,14 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Success":$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Success";
+ X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite2/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite2/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,14 +5,14 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185106Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite2/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite2/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite2/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite3/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite3/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous one
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite3/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite3/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,14 +5,14 @@
 UID:event-2
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous one
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite3/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite3/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous one
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite3/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite3/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite3/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,14 +5,14 @@
 UID:event-2
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous one
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite4/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite4/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,13 +6,13 @@
 DTSTART:20060206T200000Z
 DTEND:20060206T210000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite4/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite4/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,14 +6,14 @@
 DTSTART:20060206T200000Z
 DTEND:20060206T210000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite4/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite4/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,13 +6,13 @@
 DTSTART:20060206T200000Z
 DTEND:20060206T210000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite4/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite4/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite4/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,14 +6,14 @@
 DTSTART:20060206T200000Z
 DTEND:20060206T210000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite5/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite5/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite5/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,13 +6,13 @@
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring without conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite5/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite5/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,14 +6,14 @@
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring without conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite5/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite5/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,13 +6,13 @@
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring without conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite5/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite5/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite5/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,14 +6,14 @@
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring without conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite6/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite6/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-5
 DTSTART:20060210T104500Z
 DTEND:20060210T114500Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous recurring one
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite6/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite6/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,14 +5,14 @@
 UID:event-5
 DTSTART:20060210T104500Z
 DTEND:20060210T114500Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous recurring one
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite6/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite6/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-5
 DTSTART:20060210T104500Z
 DTEND:20060210T114500Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous recurring one
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite6/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite6/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite6/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,14 +5,14 @@
 UID:event-5
 DTSTART:20060210T104500Z
 DTEND:20060210T114500Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous recurring one
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite7/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite7/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite7/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,13 +6,13 @@
 DTSTART:20060210T080000Z
 DTEND:20060210T081000Z
 RRULE:FREQ=HOURLY;COUNT=8
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite7/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite7/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,14 +6,14 @@
 DTSTART:20060210T080000Z
 DTEND:20060210T081000Z
 RRULE:FREQ=HOURLY;COUNT=8
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite7/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite7/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,13 +6,13 @@
 DTSTART:20060210T080000Z
 DTEND:20060210T081000Z
 RRULE:FREQ=HOURLY;COUNT=8
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite7/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite7/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite7/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,14 +6,14 @@
 DTSTART:20060210T080000Z
 DTEND:20060210T081000Z
 RRULE:FREQ=HOURLY;COUNT=8
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite1/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite1/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite1/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite1/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite1/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite1/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite2/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite2/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite2/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite2/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite2/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite2/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -21,13 +21,13 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite3/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite3/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,12 +34,12 @@
 DTSTART:20060222T210000Z
 DTEND:20060222T220000Z
 RECURRENCE-ID:20060222T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite3/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite3/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,12 +34,12 @@
 DTSTART:20060222T210000Z
 DTEND:20060222T220000Z
 RECURRENCE-ID:20060222T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite3/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite3/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -21,13 +21,13 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -36,13 +36,13 @@
 DTSTART:20060222T210000Z
 DTEND:20060222T220000Z
 RECURRENCE-ID:20060222T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite4/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite4/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-2
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite4/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite4/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-2
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite4/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite4/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,13 +6,13 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite5/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite5/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite5/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-2
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,12 +33,12 @@
 DTSTART:20060222T110000Z
 DTEND:20060222T120000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite5/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite5/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-2
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,12 +33,12 @@
 DTSTART:20060222T110000Z
 DTEND:20060222T120000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite5/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite5/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,13 +6,13 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -21,13 +21,13 @@
 DTSTART:20060222T110000Z
 DTEND:20060222T120000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite6/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite6/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-2
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,12 +33,12 @@
 DTSTART:20060222T203000Z
 DTEND:20060222T213000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite6/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite6/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-2
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,12 +33,12 @@
 DTSTART:20060222T203000Z
 DTEND:20060222T213000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite6/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite6/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,13 +6,13 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=DECLINED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=DECLINED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:TRANSPARENT
 END:VEVENT
@@ -21,13 +21,13 @@
 DTSTART:20060222T203000Z
 DTEND:20060222T213000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=DECLINED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=DECLINED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:TRANSPARENT
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite7/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite7/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite7/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,11 +20,11 @@
 DTSTART:20070215T210000Z
 DTEND:20070215T220000Z
 RECURRENCE-ID:20070215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite7/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite7/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,11 +20,11 @@
 DTSTART:20070215T210000Z
 DTEND:20070215T220000Z
 RECURRENCE-ID:20070215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite7/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite7/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20070215T200000Z
 SUMMARY:Recurring event

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite8/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite8/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite8/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,11 +20,11 @@
 DTSTART:20070215T210000Z
 DTEND:20070215T220000Z
 RECURRENCE-ID:20070215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,11 +33,11 @@
 DTSTART:20070222T210000Z
 DTEND:20070222T220000Z
 RECURRENCE-ID:20070222T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite8/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite8/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite8/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,11 +20,11 @@
 DTSTART:20070215T210000Z
 DTEND:20070215T220000Z
 RECURRENCE-ID:20070215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,11 +33,11 @@
 DTSTART:20070222T210000Z
 DTEND:20070222T220000Z
 RECURRENCE-ID:20070222T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite8/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite8/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite8/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20070215T200000Z
 EXDATE:20070222T200000Z

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite1/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite1/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite1/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite1/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite1/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite1/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite2/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite2/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 SUMMARY:Recurring event

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite2/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite2/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
- message has been delivered";CN=Resource 01:$rcuaddralt1:
+ message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 SUMMARY:Recurring event

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite2/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite2/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 SUMMARY:Recurring event

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite3/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite3/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 EXDATE:20060308T200000Z,20060322T200000Z,20060405T200000Z

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite3/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite3/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 EXDATE:20060308T200000Z,20060322T200000Z,20060405T200000Z

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite3/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite3/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 EXDATE:20060308T200000Z,20060322T200000Z,20060405T200000Z

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite4/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite4/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -33,12 +33,12 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -47,12 +47,12 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -61,12 +61,12 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite4/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite4/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -33,12 +33,12 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -47,12 +47,12 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -61,12 +61,12 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite4/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite4/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -20,13 +20,13 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -35,13 +35,13 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -50,13 +50,13 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -65,13 +65,13 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite5/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite5/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite5/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -19,11 +19,11 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -32,12 +32,12 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -46,12 +46,12 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -60,12 +60,12 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite5/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite5/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
- message has been delivered";CN=Resource 01:$rcuaddralt1:
+ message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -20,11 +20,11 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -33,13 +33,13 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
- message has been delivered";CN=Resource 01:$rcuaddralt1:
+ message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -48,13 +48,13 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
- message has been delivered";CN=Resource 01:$rcuaddralt1:
+ message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -63,13 +63,13 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
- message has been delivered";CN=Resource 01:$rcuaddralt1:
+ message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite5/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite5/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
@@ -21,13 +21,13 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -36,13 +36,13 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -51,13 +51,13 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite6/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite6/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
@@ -20,11 +20,11 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -33,11 +33,11 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -46,12 +46,12 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite6/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite6/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
- message has been delivered";CN=Resource 01:$rcuaddralt1:
+ message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
@@ -21,11 +21,11 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -34,11 +34,11 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -47,13 +47,13 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
- message has been delivered";CN=Resource 01:$rcuaddralt1:
+ message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite6/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite6/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060223T200000Z
 EXDATE:20060216T200000Z
@@ -22,12 +22,12 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite7/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite7/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite7/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-3
 DTSTART:20060209T100000Z
 DTEND:20060209T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -18,12 +18,12 @@
 UID:event-3
 DTSTART:20060216T110000Z
 DTEND:20060216T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060216T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -32,12 +32,12 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite7/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite7/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-3
 DTSTART:20060209T100000Z
 DTEND:20060209T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -18,12 +18,12 @@
 UID:event-3
 DTSTART:20060216T110000Z
 DTEND:20060216T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -32,12 +32,12 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite7/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite7/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-3
 DTSTART:20060216T110000Z
 DTEND:20060216T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -20,13 +20,13 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite8/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite8/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite8/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-3
 DTSTART:20060209T100000Z
 DTEND:20060209T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060216T100000Z
 SUMMARY:Recurring event with overridden instances
@@ -19,12 +19,12 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite8/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite8/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite8/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,11 +5,11 @@
 UID:event-3
 DTSTART:20060209T100000Z
 DTEND:20060209T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060216T100000Z
 SUMMARY:Recurring event with overridden instances
@@ -19,12 +19,12 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite8/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite8/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite8/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite1/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite1/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite1/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite1/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite1/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite1/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite2/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite2/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite2/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite2/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite2/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite2/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -21,13 +21,13 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite3/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite3/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite3/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,11 +34,11 @@
 RECURRENCE-ID:20060204T200000Z
 DTSTART:20060203T200000Z
 DTEND:20060203T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1::$cuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1::$cuaddralt1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite3/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite3/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,11 +34,11 @@
 RECURRENCE-ID:20060204T200000Z
 DTSTART:20060203T200000Z
 DTEND:20060203T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddralt1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite3/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite3/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 EXDATE:20060204T200000Z
 SUMMARY:Recurring event
@@ -22,13 +22,13 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=User 01:$cuaddralt1:
-ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;RSVP=TRUE;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered":$cuaddralt1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
+ ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T151000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -40,9 +40,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060101T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 BEGIN:VALARM
 ACTION:DISPLAY
 DESCRIPTION:Alarm for Organizer!

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
@@ -38,12 +38,12 @@
 RECURRENCE-ID;TZID=US/Eastern:20060101T100000
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
  cheduling message has been delivered":$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/copymove/put-restrictions/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/deletecalendar/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/deletecalendar/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/deletecalendar/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event5 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/deletecalendar/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event5 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/errors/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/errors/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/errors/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$rcuaddralt1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/errors/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/errors/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/errors/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,12 +25,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
- uccess":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
+ uccess";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,12 +25,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,11 +25,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,11 +25,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T151000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,9 +25,9 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 REQUEST-STATUS:2.0;Success
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,12 +25,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
- uccess":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
+ uccess";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,12 +25,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
  uccess":$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/proxy/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/13.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/proxy/13.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-3
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$cuaddralt3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 02:$cuaddralt2:
+ORGANIZER;CN=$username2::$cuaddralt2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/proxy/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/14.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/proxy/14.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=User 03;PARTSTAT=DECLINED:$cuaddralt3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;CN=$username3:;PARTSTAT=DECLINED:$cuaddralt3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 02:$cuaddralt2:
+ORGANIZER;CN=$username2::$cuaddralt2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/proxy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/proxy/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$cuaddralt3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 02:$cuaddralt2:
+ORGANIZER;CN=$username2::$cuaddralt2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/proxy/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/proxy/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=User 03;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddralt3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 02:$cuaddralt2:
+ORGANIZER;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/proxy/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/proxy/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 02:$cuaddralt2:
+ORGANIZER;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/proxy/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/proxy/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:$cuaddralt3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED:$cuaddralt3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 02:$cuaddralt2:
+ORGANIZER;CN=$username2::$cuaddralt2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/proxy/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/proxy/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,12 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Success":$cuaddralt3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Success";
+ X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 02:$cuaddralt2:
+ORGANIZER;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/proxy/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/proxy/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:$cuaddralt3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 02;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddralt2:
+ORGANIZER;CN=$username2:;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -40,9 +40,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
  uccess":$cuaddr3:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
@@ -41,11 +41,11 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
  uccess":$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
  uccess":$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,10 +28,10 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,9 +28,9 @@
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -42,9 +42,9 @@
 X-APPLE-NEEDS-REPLY:TRUE
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -41,9 +41,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -29,8 +29,8 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/12.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/12.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
@@ -41,9 +41,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/13.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/13.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1 - master
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -40,8 +40,8 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/14.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/14.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 1 - master
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -41,9 +41,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/15.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/15.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,9 +28,9 @@
 DURATION:PT1H
 SUMMARY:event 1 - master
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -41,8 +41,8 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/16.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/16.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1 - master
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
@@ -41,9 +41,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -40,8 +40,8 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -41,9 +41,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -29,8 +29,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;
+ X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
@@ -41,9 +41,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -40,8 +40,8 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 BEGIN:VALARM
 ACTION:DISPLAY
 DESCRIPTION:Alarm for Organizer!

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
  uccess":$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 4
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
- uccess":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
+ uccess";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/12.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/12.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/13.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/13.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,13 +24,13 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
  uccess":$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T215953Z
 LAST-MODIFIED:20051222T215953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/14.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/14.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 LAST-MODIFIED:20051222T215953Z
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
- uccess":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
+ uccess";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T215953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 BEGIN:VALARM
 ACTION:DISPLAY
 DESCRIPTION:Alarm for Organizer!

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 X-APPLE-NEEDS-REPLY:TRUE
 BEGIN:VALARM

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 X-FOOBAR:My X-property is here
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-FOOBAR:My X-property is here
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 X-FOOBAR:My X-property is here
 X-BARFOO:Another X-property here
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-FOOBAR:My X-property is here
 X-BARFOO:Another X-property here

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 X-MORE-FOOBAR:Another X-property from the attendee
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T151000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
  ss":$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=DECLINED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=DECLINED:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=DECLINED:$cuaddr3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=ACCEPTED:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED:$cuaddr3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/12.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/12.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,12 +25,12 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr3:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/15.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/15.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/16.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/16.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,11 +25,11 @@
 CREATED:20060101T151000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
  cheduling message has been delivered":$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
  cheduling message has been delivered":$cuaddr3:
 SUMMARY:event 1
 UID:event1 at ninevah.local

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,12 +25,12 @@
 CREATED:20060101T151000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr3:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/18.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/18.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/19.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/19.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED:$cuaddr3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -26,10 +26,10 @@
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
 ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=DECLINED:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:$cuaddr3:
+ vered";CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,9 +25,9 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,9 +25,9 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,9 +25,9 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,9 +25,9 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/nonascii/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/nonascii/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/nonascii/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:\xD4test\xD5
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/performance/schedule/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/performance/schedule/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/performance/schedule/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/performance/schedule/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/performance/schedule/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/performance/schedule/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -45,9 +45,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -75,9 +75,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -105,9 +105,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -135,9 +135,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -165,9 +165,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -195,9 +195,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -225,9 +225,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -255,9 +255,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -285,9 +285,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -315,9 +315,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -345,9 +345,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -375,9 +375,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -405,9 +405,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -435,9 +435,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -465,9 +465,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -495,9 +495,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -525,9 +525,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -555,9 +555,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -585,9 +585,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -615,9 +615,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -645,9 +645,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -675,9 +675,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -705,9 +705,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -735,9 +735,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -765,9 +765,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -795,9 +795,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -825,9 +825,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -855,9 +855,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -885,9 +885,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -915,9 +915,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -945,9 +945,9 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 BEGIN:VEVENT
 UID:2C4B2FBA47EE8E856883C07C1 at example.local
@@ -975,8 +975,8 @@
  ATTENDEE:user16 at example.com
  ATTENDEE:user17 at example.com
  ATTENDEE:user18 at example.com
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/performance/schedule/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/performance/schedule/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/performance/schedule/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 6 and some more text and some more text
   and some more text and some more text and some more text
-ORGANIZER;CN=User 01:$principal:
-ATTENDEE;CN=User 02;RSVP=TRUE:$principal2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$principal3:
+ORGANIZER;CN=$username1::$principal:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$principal2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$principal3:
 ATTACH;FMTTYPE=image/basic;ENCODING=BASE64;VALUE=BINARY:
  MIICajCCAdOgAwIBAgICBEUwDQYJKoZIhvcNAQEEBQAwdzELMAkGA1U
  MIICajCCAdOgAwIBAgICBEUwDQYJKoZIhvcNAQEEBQAwdzELMAkGA1U

Modified: CalDAVTester/trunk/Resource/performance/schedule/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/performance/schedule/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/performance/schedule/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
 DTSTART:20060201T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060202T000000Z

Modified: CalDAVTester/trunk/Resource/performance/schedule/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/performance/schedule/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/performance/schedule/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,9 +5,9 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 ATTENDEE;CN=User 04:/principals/user/user04
 ATTENDEE;CN=User 05:/principals/user/user05
 ATTENDEE;CN=User 06:/principals/user/user06

Modified: CalDAVTester/trunk/Resource/performance/schedule/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/performance/schedule/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/performance/schedule/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,9 +5,9 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 ATTENDEE;CN=User 04:/principals/user/user04
 ATTENDEE;CN=User 05:/principals/user/user05
 ATTENDEE;CN=User 06:/principals/user/user06

Modified: CalDAVTester/trunk/Resource/privatecomments/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted - again!
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,16 +24,16 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted - again!
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/12.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/12.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 X-CALENDARSERVER-PRIVATE-COMMENT:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/13.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/13.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,16 +24,16 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/14.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/14.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/15.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/15.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 X-CALENDARSERVER-PRIVATE-COMMENT:Hey this looks cool
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/16.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/16.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,18 +24,18 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr3:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn3:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:Hey this looks cool
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/17.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/17.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-CALENDARSERVER-PRIVATE-COMMENT:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/18.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/18.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 2
 UID:event2 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 RRULE:FREQ=DAILY;COUNT=10
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/19.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/19.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 RRULE:FREQ=DAILY;COUNT=10
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/20.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/20.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 RRULE:FREQ=DAILY;COUNT=10
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/privatecomments/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/21.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/21.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 2
 RRULE:FREQ=DAILY;COUNT=10
 X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted all these.
@@ -38,11 +38,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 2
 X-CALENDARSERVER-PRIVATE-COMMENT:I have declined this one. So there!
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/22.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/22.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,15 +24,15 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 RRULE:FREQ=DAILY;COUNT=10
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted all these.
 END:VEVENT
 BEGIN:VEVENT
@@ -40,14 +40,14 @@
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have declined this one. So 
  there!
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/23.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/23.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,13 +24,13 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr3:
 X-CALENDARSERVER-PRIVATE-COMMENT:I have declined!
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/24.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/24.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/24.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,18 +24,18 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have declined!
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr3:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn3:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:Hey this looks cool
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/25.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/25.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/25.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-CALENDARSERVER-PRIVATE-COMMENT:Hey this looks cool
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/26.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/26.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/26.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:event 3
 UID:event3 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/27.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/27.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/27.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/28.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/28.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/28.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/29.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/29.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/29.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 3
 X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/30.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/30.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/30.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";CN=User 01:$cuaddr1:
+ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";CN=$username1:;
+ X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/31.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/31.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/31.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/32.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/32.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/32.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/33.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/33.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/33.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 3
 X-CALENDARSERVER-PRIVATE-COMMENT:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/34.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/34.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/34.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";CN=User 01:$cuaddr1:
+ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";CN=$username1:;
+ X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-CALENDARSERVER-PRIVATE-COMMENT:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/35.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/35.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/35.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,14 +24,14 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/36.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/36.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/36.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/37.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/37.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/37.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,13 +24,13 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/38.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/38.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,13 +24,13 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:Add something here.
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 SUMMARY:event 1
 X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted!
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privatecomments/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -24,16 +24,16 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
- ss":$cuaddr2:
-ATTENDEE;CN=User 03;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered":$cuaddr3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
-X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted!
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privateevents/28.xml
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/28.xml	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privateevents/28.xml	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,9 @@
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
 <C:prop-filter name="ORGANIZER">
+<C:param-filter name="X-CALENDARSERVER-EMAIL">
 <C:text-match>example</C:text-match>
+</C:param-filter>
 </C:prop-filter>
 </C:comp-filter>
 </C:comp-filter>

Modified: CalDAVTester/trunk/Resource/privateevents/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privateevents/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -29,8 +29,8 @@
 DURATION:PT1H
 SUMMARY:event 3
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
+ORGANIZER;CN=$username1::$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$cuaddralt3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privateevents/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/38.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privateevents/38.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -54,11 +54,11 @@
 UID:54E181BC7CCC373042B28842FFC at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling mess
- age has been delivered":$cuaddr2:
+ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2;Scheduling mess
+ age has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 DTSTAMP:20051222T205953Z
 LOCATION:confidential 1
-ORGANIZER:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event confidential access 1
 BEGIN:VALARM
 ACTION:DISPLAY
@@ -70,11 +70,11 @@
 UID:54E181BC7CCC373042B28842FFD at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling mess
- age has been delivered":$cuaddr2:
+ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2;Scheduling mess
+ age has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 DTSTAMP:20051222T205953Z
 LOCATION:restricted 1
-ORGANIZER:$cuaddr1:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event restricted access 1
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/privateevents/49.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/49.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privateevents/49.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,9 @@
 DURATION:PT1H
 SUMMARY:event confidential access 2
 LOCATION:confidential 2
-ORGANIZER:$cuaddr1:
-ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";
+ X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 UID:54E181BC7CCC373042B28842FFC-40 at ninevah.local
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/privateevents/50.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/50.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/privateevents/50.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,9 @@
 DURATION:PT1H
 SUMMARY:event restricted access 2
 LOCATION:restricted 2
-ORGANIZER:$cuaddr1:
-ATTENDEE;SCHEDULE-STATUS="1.2;Scheduling message has been delivered":$cuaddr2:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";
+ X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
 UID:54E181BC7CCC373042B28842FFD-42 at ninevah.local
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/schedule/17.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/17.txt	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/17.txt	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:cuaddr4:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:cuaddr2:
-ATTENDEE;CN=User 03:cuaddr3:
+ORGANIZER;CN=$username1::cuaddr4:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:cuaddr2:
+ATTENDEE;CN=$username3::cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedule/18.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/18.txt	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/18.txt	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,7 +28,7 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:cuaddr4:
-ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:cuaddr3:
+ORGANIZER;CN=$username1::cuaddr4:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED:cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedule/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedule/19.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/19.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddraltnoslash1:
-ATTENDEE;CN=User 02:$cuaddraltnoslash2:
+ORGANIZER;CN=$username1::$cuaddraltnoslash1:
+ATTENDEE;CN=$username2::$cuaddraltnoslash2:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060102T000000Z

Modified: CalDAVTester/trunk/Resource/schedule/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/2.txt	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/2.txt	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedule/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedule/20.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/20.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,7 +28,7 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=Disabled Group;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddrdisabled:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedule/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedule/21.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/21.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -29,6 +29,6 @@
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
 ORGANIZER;CN=Disabled Group:$cuaddrdisabled:
-ATTENDEE;CN=User 01;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr1:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedule/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedule/22.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/22.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,6 +28,6 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedule/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedule/23.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/23.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,9 +5,9 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:mailto:broken at example.com
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::mailto:broken at example.com
+ATTENDEE;CN=$username3::$cuaddr3:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060102T000000Z

Modified: CalDAVTester/trunk/Resource/schedule/3.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/3.txt	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/3.txt	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedule/4.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/4.txt	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/4.txt	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:cuaddr4:
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::cuaddr4:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedule/5.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/5.txt	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/5.txt	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,18 +7,18 @@
 DTSTAMP:20051222T205953Z
 DTSTART:20060108T050000Z
 DTEND:20060109T050000Z
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 UID:bogus-1 at example.com
 END:VFREEBUSY
 BEGIN:VFREEBUSY
 DTSTAMP:20051222T205953Z
 DTSTART:20060110T050000Z
 DTEND:20060111T050000Z
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 UID:bogus-2 at example.com
 END:VFREEBUSY
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedule/6.txt
===================================================================
--- CalDAVTester/trunk/Resource/schedule/6.txt	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedule/6.txt	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,9 +5,9 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 03:$cuaddr3:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username3::$cuaddr3:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060102T000000Z

Modified: CalDAVTester/trunk/Resource/scheduleacl/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleacl/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleacl/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr2:
-ATTENDEE;CN=User 02:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr2:
+ATTENDEE;CN=$username2::$cuaddr1:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060102T000000Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,9 +6,9 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060206T200000Z
 DTEND:20060206T210000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-4
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;RSVP=TRUE:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/12.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/12.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-4
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/13.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/13.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-4
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/14.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/14.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-5
 DTSTART:20060210T104500Z
 DTEND:20060210T114500Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;RSVP=TRUE:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/15.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/15.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-5
 DTSTART:20060210T104500Z
 DTEND:20060210T114500Z
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/16.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/16.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-6
 DTSTART:20060210T080000Z
 DTEND:20060210T081000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;RSVP=TRUE:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/17.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/17.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-6
 DTSTART:20060210T080000Z
 DTEND:20060210T081000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/18.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/18.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02:$cuaddralt2:
-ATTENDEE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=$username2::$cuaddralt2:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/19.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/19.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-19
 DTSTART:20060308T200000Z
 DTEND:20060308T210000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;RSVP=FALSE:$rcuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;RSVP=FALSE:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,9 +5,9 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/20.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/20.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-19
 DTSTART:20060308T200000Z
 DTEND:20060308T210000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/21.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/21.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01;RSVP=FALSE:$rcuaddralt1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1:;RSVP=FALSE:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=Resource 01;RSVP=FALSE;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;RSVP=FALSE;PARTSTAT=ACCEPTED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-2
 DTSTART:20060208T203000Z
 DTEND:20060208T213000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;RSVP=TRUE:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-2
 DTSTART:20060208T203000Z
 DTEND:20060208T213000Z
-ATTENDEE;CN=Resource 01;PARTSTAT=DECLINED:$rcuaddralt1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleauto/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleauto/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleauto/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060206T200000Z
 DTEND:20060206T210000Z
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$resourcename1:;RSVP=TRUE:$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -19,7 +19,7 @@
 RECURRENCE-ID:20060216T200000Z
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -33,7 +33,7 @@
 RECURRENCE-ID:20060223T200000Z
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -47,7 +47,7 @@
 RECURRENCE-ID:20060309T200000Z
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -61,7 +61,7 @@
 RECURRENCE-ID:20060323T200000Z
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/12.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/12.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -20,7 +20,7 @@
 RECURRENCE-ID:20060223T200000Z
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -34,7 +34,7 @@
 RECURRENCE-ID:20060309T200000Z
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -48,7 +48,7 @@
 RECURRENCE-ID:20060323T200000Z
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/13.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/13.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -21,7 +21,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/14.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/14.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -21,7 +21,7 @@
 RECURRENCE-ID:20060323T200000Z
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/15.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/15.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,7 @@
 SEQUENCE:8
 DTSTART:20060210T100000Z
 DTEND:20060210T110000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -21,7 +21,7 @@
 SEQUENCE:8
 DTSTART:20060217T100000Z
 DTEND:20060217T110000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/16.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/16.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 RECURRENCE-ID:20060210T100000Z
 DTSTART:20060210T100000Z
 DTEND:20060210T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -20,7 +20,7 @@
 RECURRENCE-ID:20060217T100000Z
 DTSTART:20060217T100000Z
 DTEND:20060217T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/17.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/17.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-2
 DTSTART:20060210T100000Z
 DTEND:20060210T110000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/18.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/18.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 RECURRENCE-ID:20060217T100000Z
 DTSTART:20060217T100000Z
 DTEND:20060217T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/19.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/19.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-2
 DTSTART:20060217T100000Z
 DTEND:20060217T110000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -21,7 +21,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -36,7 +36,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-2
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurcancel/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurcancel/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurcancel/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -19,7 +19,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -33,7 +33,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -47,7 +47,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -61,7 +61,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-3
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060215T200000Z
 DTEND:20060215T210000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -21,7 +21,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060222T230000Z
 DTEND:20060223T000000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -19,7 +19,7 @@
 RECURRENCE-ID:20060215T200000Z
 DTSTART:20060215T220000Z
 DTEND:20060215T230000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -34,7 +34,7 @@
 RECURRENCE-ID:20060222T200000Z
 DTSTART:20060222T230000Z
 DTEND:20060223T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/12.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/12.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,7 @@
 RECURRENCE-ID:20060222T200000Z
 DTSTART:20060222T230000Z
 DTEND:20060223T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/13.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/13.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-2
 DTSTART:20060210T100000Z
 DTEND:20060210T110000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/14.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/14.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 RECURRENCE-ID:20060210T100000Z
 DTSTART:20060210T100000Z
 DTEND:20060210T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/15.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/15.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,7 @@
 RECURRENCE-ID:20060210T100000Z
 DTSTART:20060210T100000Z
 DTEND:20060210T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/16.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/16.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-2
 DTSTART:20060217T100000Z
 DTEND:20060217T110000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/17.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/17.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 RECURRENCE-ID:20060210T100000Z
 DTSTART:20060210T100000Z
 DTEND:20060210T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -19,7 +19,7 @@
 RECURRENCE-ID:20060217T100000Z
 DTSTART:20060217T100000Z
 DTEND:20060217T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/18.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/18.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,7 @@
 RECURRENCE-ID:20060217T100000Z
 DTSTART:20060217T100000Z
 DTEND:20060217T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/19.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/19.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-2
 DTSTART:20060217T120000Z
 DTEND:20060217T113000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/20.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/20.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 RECURRENCE-ID:20060210T100000Z
 DTSTART:20060210T100000Z
 DTEND:20060210T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -19,7 +19,7 @@
 RECURRENCE-ID:20060217T100000Z
 DTSTART:20060217T120000Z
 DTEND:20060217T113000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/21.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/21.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,7 @@
 RECURRENCE-ID:20060217T100000Z
 DTSTART:20060217T120000Z
 DTEND:20060217T113000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/22.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/22.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-22
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=User 02:$cuaddralt2:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$username2::$cuaddralt2:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -20,8 +20,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-22
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=User 02:$cuaddralt2:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$username2::$cuaddralt2:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/23.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/23.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-22
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=DECLINED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -21,7 +21,7 @@
 RECURRENCE-ID:20060215T200000Z
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
-ATTENDEE;PARTSTAT=DECLINED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -19,7 +19,7 @@
 RECURRENCE-ID:20060215T200000Z
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,7 @@
 RECURRENCE-ID:20060215T200000Z
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060215T220000Z
 DTEND:20060215T230000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -21,7 +21,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060222T210000Z
 DTEND:20060222T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -19,7 +19,7 @@
 RECURRENCE-ID:20060215T200000Z
 DTSTART:20060215T220000Z
 DTEND:20060215T230000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -34,7 +34,7 @@
 RECURRENCE-ID:20060222T200000Z
 DTSTART:20060222T210000Z
 DTEND:20060222T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurrequest/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurrequest/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurrequest/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,7 @@
 RECURRENCE-ID:20060215T200000Z
 DTSTART:20060215T220000Z
 DTEND:20060215T230000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -23,7 +23,7 @@
 RECURRENCE-ID:20060222T200000Z
 DTSTART:20060222T210000Z
 DTEND:20060222T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurspecial/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurspecial/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurspecial/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurspecial/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurspecial/2.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurspecial/2.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurspecial/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurspecial/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurspecial/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,7 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurspecial/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurspecial/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurspecial/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -19,7 +19,7 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurspecial/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurspecial/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurspecial/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -7,7 +7,7 @@
 RECURRENCE-ID:20060204T200000Z
 DTSTART:20060204T200000Z
 DTEND:20060204T221000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/scheduleautorecurspecial/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/scheduleautorecurspecial/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/scheduleautorecurspecial/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
@@ -20,7 +20,7 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddralt1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/schedulemaskuid/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/10.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/10.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z

Modified: CalDAVTester/trunk/Resource/schedulemaskuid/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/11.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/11.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 02:$cuaddr2:
-ATTENDEE;CN=User 02:$cuaddr2:
+ORGANIZER;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username2::$cuaddr2:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z

Modified: CalDAVTester/trunk/Resource/schedulemaskuid/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,7 +27,7 @@
 DURATION:PT1H
 SUMMARY:event 3
 UID:1234 at example.com-3
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedulemaskuid/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,7 +27,7 @@
 DURATION:PT1H
 SUMMARY:event 4
 UID:1234 at example.com-4
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedulemaskuid/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -27,7 +27,7 @@
 DURATION:PT1H
 SUMMARY:event 5
 UID:1234 at example.com-5
-ORGANIZER;CN=User 03:$cuaddr3:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddr2:
+ORGANIZER;CN=$username3::$cuaddr3:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddr2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedulemaskuid/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z

Modified: CalDAVTester/trunk/Resource/schedulemaskuid/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z

Modified: CalDAVTester/trunk/Resource/schedulemaskuid/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z

Modified: CalDAVTester/trunk/Resource/schedulemaskuid/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z

Modified: CalDAVTester/trunk/Resource/schedulenormal/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulenormal/1.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulenormal/1.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddralt1:
-ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=User 03;RSVP=TRUE:$cuaddralt3:
+ORGANIZER;CN=$username1::$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+ATTENDEE;CN=$username3:;RSVP=TRUE:$cuaddralt3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/schedulenormal/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulenormal/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/schedulenormal/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -28,7 +28,7 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:54E181BC7CCC373042B28842 at ninevah.local
-ORGANIZER;CN=User 01:$cuaddralt1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
+ORGANIZER;CN=$username1::$cuaddralt1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddralt2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/servertoserver/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/servertoserver/3.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/servertoserver/3.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
 ORGANIZER;CN=Remote 01:mailto:remote01 at example.org
-ATTENDEE;CN=User 01:$cuaddr1:
+ATTENDEE;CN=$username1::$cuaddr1:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z

Modified: CalDAVTester/trunk/Resource/servertoserver/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/servertoserver/4.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/servertoserver/4.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,8 +5,8 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z
 DTEND:20060103T000000Z

Modified: CalDAVTester/trunk/Resource/servertoserver/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/servertoserver/5.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/servertoserver/5.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ORGANIZER;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/servertoserver/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/servertoserver/6.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/servertoserver/6.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,7 +6,7 @@
 UID:20060110T231240Z-4011c71-187-6f73-1-6
 DTSTART:20060102T200000Z
 DTEND:20060102T210000Z
-ATTENDEE;CN=User 01:$cuaddr1:
+ATTENDEE;CN=$username1::$cuaddr1:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/servertoserver/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/servertoserver/7.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/servertoserver/7.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -6,8 +6,8 @@
 UID:20060110T231240Z-4011c71-187-6f73-1-7
 DTSTART:20060102T220000Z
 DTEND:20060102T230000Z
-ATTENDEE;CN=User 01:$cuaddr1:
-ATTENDEE;CN=User 02:$cuaddr2:
+ATTENDEE;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username2::$cuaddr2:
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/servertoserver/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/servertoserver/8.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/servertoserver/8.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -5,7 +5,7 @@
 METHOD:REQUEST
 BEGIN:VFREEBUSY
 UID:20060110T231240Z-4011c71-187-6f73-fb
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=Remote 01:mailto:remote01 at example.org
 DTSTART:20060101T000000Z
 DTSTAMP:20060309T185105Z

Modified: CalDAVTester/trunk/Resource/servertoserver/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/servertoserver/9.ics	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/Resource/servertoserver/9.ics	2008-12-19 20:23:53 UTC (rev 3559)
@@ -10,7 +10,7 @@
 CREATED:20060110T231240Z
 DESCRIPTION:+1 605 990 0100\nAccess: 879307#
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=User 01:$cuaddr1:
+ORGANIZER;CN=$username1::$cuaddr1:
 STATUS:CONFIRMED
 SUMMARY:TC Realtime
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2008-12-19 20:23:53 UTC (rev 3559)
@@ -191,83 +191,113 @@
 			<value>superuser</value>
 		</substitution>
 
-		<!-- user id -->
-		<substitution repeat="10">
-			<key>$userid%%d:</key>
-			<value>user%%02d</value>
-		</substitution>
-		<!-- user guid -->
-		<substitution repeat="10">
-			<key>$userguid%%d:</key>
-			<value>user%%02d</value>
-		</substitution>
-		<!-- password -->
-		<substitution repeat="10">
-			<key>$pswd%%d:</key>
-			<value>user%%02d</value>
-		</substitution>
-		<!-- relative path to first user principal resource-->
-		<substitution repeat="10">
-			<key>$principal%%d:</key>
-			<value>$principals_users:$userid%%d:/</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$principaluri%%d:</key>
-			<value>$principals_uids:$userguid%%d:/</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$principal%%dnoslash:</key>
-			<value>$principals_users:$userid%%d:</value>
-		</substitution>
-		<!-- relative path to first user calendar home-->
-		<substitution repeat="10">
-			<key>$pathprefix%%d:</key>
-			<value>$calendars_uids:$userguid%%d:</value>
-		</substitution>
-		<!-- relative path to first user calendar-->
-		<substitution repeat="10">
-			<key>$calendarpath%%d:</key>
-			<value>$calendars_uids:$userguid%%d:/$calendar:</value>
-		</substitution>
-		<!-- relative path to first user calendar home-->
-		<substitution repeat="10">
-			<key>$calendarpathalt%%d:</key>
-			<value>$calendars_uids:$userid%%d:/$calendar:</value>
-		</substitution>
-		<!-- calendar user address of first user-->
-		<substitution repeat="10">
-			<key>$cuaddr%%d:</key>
-			<value>mailto:$userid%%d:@example.com</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$cuaddralt%%d:</key>
-			<value>$principaluri%%d:</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$cuaddraltnoslash%%d:</key>
-			<value>$principals_uids:$userguid%%d:</value>
-		</substitution>
-		
+		<!--  Ten user accounts -->
+		<repeat count="10">
+			<!-- user id -->
+			<substitution>
+				<key>$userid%%d:</key>
+				<value>user%%02d</value>
+			</substitution>
+			<!-- user guid -->
+			<substitution>
+				<key>$userguid%%d:</key>
+				<value>user%%02d</value>
+			</substitution>
+			<!-- user name -->
+			<substitution>
+				<key>$username%%d:</key>
+				<value>User %%02d</value>
+			</substitution>
+			<!-- password -->
+			<substitution>
+				<key>$pswd%%d:</key>
+				<value>user%%02d</value>
+			</substitution>
+			<!-- relative path to user principal resource-->
+			<substitution>
+				<key>$principal%%d:</key>
+				<value>$principals_users:$userid%%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$principaluri%%d:</key>
+				<value>$principals_uids:$userguid%%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$principal%%dnoslash:</key>
+				<value>$principals_users:$userid%%d:</value>
+			</substitution>
+			<!-- relative path to user calendar home-->
+			<substitution>
+				<key>$pathprefix%%d:</key>
+				<value>$calendars_uids:$userguid%%d:</value>
+			</substitution>
+			<!-- relative path to user calendar-->
+			<substitution>
+				<key>$calendarpath%%d:</key>
+				<value>$calendars_uids:$userguid%%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to user inbox-->
+			<substitution>
+				<key>$inboxpath%%d:</key>
+				<value>$calendars_uids:$userguid%%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to user outbox-->
+			<substitution>
+				<key>$outboxpath%%d:</key>
+				<value>$calendars_uids:$userguid%%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to user dropbox-->
+			<substitution>
+				<key>$dropboxpath%%d:</key>
+				<value>$calendars_uids:$userguid%%d:/$dropbox:</value>
+			</substitution>
+			<!-- relative path to user freebusy-->
+			<substitution>
+				<key>$freebusypath%%d:</key>
+				<value>$calendars_uids:$userguid%%d:/$freebusy:</value>
+			</substitution>
+			<!-- relative path to user alternate calendar home-->
+			<substitution>
+				<key>$calendarpathalt%%d:</key>
+				<value>$calendars_users:$userid%%d:/$calendar:</value>
+			</substitution>
+			<substitution>
+				<key>$email%%d:</key>
+				<value>$userid%%d:@example.com</value>
+			</substitution>
+			<!-- calendar user address of user-->
+			<substitution>
+				<key>$cuaddr%%d:</key>
+				<value>mailto:$email%%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddralt%%d:</key>
+				<value>$principaluri%%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddraltnoslash%%d:</key>
+				<value>$principals_uids:$userguid%%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddrurn%%d:</key>
+				<value>urn:uuid:$userguid%%d:</value>
+			</substitution>
+		</repeat>
+
 		<!--  Override some of the above definitions for special cases -->
 
 		<!-- calendar user address of second user-->
 		<substitution>
 			<key>$cuaddr2:</key>
-			<value>MAILTO:user02 at example.com</value>
+			<value>MAILTO:$email2:</value>
 		</substitution>
 
-		<substitution>
-			<key>$userguid1:</key>
-			<value>%(userguid1)s</value>
-		</substitution>
-		<substitution>
-			<key>$userguid12:</key>
-			<value>%(userguid2)s</value>
-		</substitution>
-		<substitution>
-			<key>$userguid3:</key>
-			<value>%(userguid3)s</value>
-		</substitution>
+		<repeat count="3">
+			<substitution>
+				<key>$userguid%%d:</key>
+				<value>%(userguid%%d)s</value>
+			</substitution>
+		</repeat>
 
 		<!-- resource id-->
 		<substitution>
@@ -279,6 +309,11 @@
 			<key>$resourceguid1:</key>
 			<value>%(resourceguid1)s</value>
 		</substitution>
+		<!-- resource name-->
+		<substitution>
+			<key>$resourcename1:</key>
+			<value>Resource 01</value>
+		</substitution>
 		<!-- relative path to first resource calendar home-->
 		<substitution>
 			<key>$rpathprefix1:</key>
@@ -289,6 +324,16 @@
 			<key>$rcalendarpath1:</key>
 			<value>$calendars_uids:$resourceguid1:/$calendar:</value>
 		</substitution>
+		<!-- relative path to first resource inbox-->
+		<substitution>
+			<key>$rinboxpath1:</key>
+			<value>$calendars_uids:$resourceguid1:/$inbox:</value>
+		</substitution>
+		<!-- relative path to first resource outbox-->
+		<substitution>
+			<key>$routboxpath1:</key>
+			<value>$calendars_uids:$resourceguid1:/$outbox:</value>
+		</substitution>
 		<!-- relative path to first resource principal resource-->
 		<substitution>
 			<key>$rprincipal1:</key>
@@ -302,6 +347,10 @@
 			<key>$rcuaddralt1:</key>
 			<value>$rprincipaluri1:</value>
 		</substitution>
+		<substitution>
+			<key>$rcuaddrurn1:</key>
+			<value>urn:uuid:$resourceguid1:</value>
+		</substitution>
 
 		<!-- relative path to disabled group principal resource-->
 		<substitution>

Modified: CalDAVTester/trunk/scripts/server/serverinfo.dtd
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.dtd	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/scripts/server/serverinfo.dtd	2008-12-19 20:23:53 UTC (rev 3559)
@@ -20,9 +20,10 @@
 	<!ELEMENT port			(#PCDATA)>
 	<!ELEMENT authtype		(#PCDATA)>
 	<!ELEMENT ssl			EMPTY>
-	<!ELEMENT substitutions	(substitution*)>
+	<!ELEMENT substitutions	(substitution|repeat)*>
+		<!ELEMENT repeat	(substitution+)>
+    		<!ATTLIST repeat count CDATA "1">
 		<!ELEMENT substitution	(key, value)>
-    		<!ATTLIST substitution repeat CDATA "1">
 			<!ELEMENT key			(#PCDATA)>
 			<!ELEMENT value			(#PCDATA)>
 	

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2008-12-19 20:23:53 UTC (rev 3559)
@@ -191,89 +191,105 @@
 			<value>superuser</value>
 		</substitution>
 
-		<!-- user id -->
-		<substitution repeat="10">
-			<key>$userid%d:</key>
-			<value>user%02d</value>
-		</substitution>
-		<!-- user guid -->
-		<substitution repeat="10">
-			<key>$userguid%d:</key>
-			<value>user%02d</value>
-		</substitution>
-		<!-- password -->
-		<substitution repeat="10">
-			<key>$pswd%d:</key>
-			<value>user%02d</value>
-		</substitution>
-		<!-- relative path to user principal resource-->
-		<substitution repeat="10">
-			<key>$principal%d:</key>
-			<value>$principals_users:$userid%d:/</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$principaluri%d:</key>
-			<value>$principals_uids:$userguid%d:/</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$principal%dnoslash:</key>
-			<value>$principals_users:$userid%d:</value>
-		</substitution>
-		<!-- relative path to user calendar home-->
-		<substitution repeat="10">
-			<key>$pathprefix%d:</key>
-			<value>$calendars_uids:$userguid%d:</value>
-		</substitution>
-		<!-- relative path to user calendar-->
-		<substitution repeat="10">
-			<key>$calendarpath%d:</key>
-			<value>$calendars_uids:$userguid%d:/$calendar:</value>
-		</substitution>
-		<!-- relative path to user inbox-->
-		<substitution repeat="10">
-			<key>$inboxpath%d:</key>
-			<value>$calendars_uids:$userguid%d:/$inbox:</value>
-		</substitution>
-		<!-- relative path to user outbox-->
-		<substitution repeat="10">
-			<key>$outboxpath%d:</key>
-			<value>$calendars_uids:$userguid%d:/$outbox:</value>
-		</substitution>
-		<!-- relative path to user dropbox-->
-		<substitution repeat="10">
-			<key>$dropboxpath%d:</key>
-			<value>$calendars_uids:$userguid%d:/$dropbox:</value>
-		</substitution>
-		<!-- relative path to user freebusy-->
-		<substitution repeat="10">
-			<key>$freebusypath%d:</key>
-			<value>$calendars_uids:$userguid%d:/$freebusy:</value>
-		</substitution>
-		<!-- relative path to user alternate calendar home-->
-		<substitution repeat="10">
-			<key>$calendarpathalt%d:</key>
-			<value>$calendars_users:$userid%d:/$calendar:</value>
-		</substitution>
-		<!-- calendar user address of user-->
-		<substitution repeat="10">
-			<key>$cuaddr%d:</key>
-			<value>mailto:$userid%d:@example.com</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$cuaddralt%d:</key>
-			<value>$principaluri%d:</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$cuaddraltnoslash%d:</key>
-			<value>$principals_uids:$userguid%d:</value>
-		</substitution>
-		
+		<!--  Ten user accounts -->
+		<repeat count="10">
+			<!-- user id -->
+			<substitution>
+				<key>$userid%d:</key>
+				<value>user%02d</value>
+			</substitution>
+			<!-- user guid -->
+			<substitution>
+				<key>$userguid%d:</key>
+				<value>user%02d</value>
+			</substitution>
+			<!-- user name -->
+			<substitution>
+				<key>$username%d:</key>
+				<value>User %02d</value>
+			</substitution>
+			<!-- password -->
+			<substitution>
+				<key>$pswd%d:</key>
+				<value>user%02d</value>
+			</substitution>
+			<!-- relative path to user principal resource-->
+			<substitution>
+				<key>$principal%d:</key>
+				<value>$principals_users:$userid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$principaluri%d:</key>
+				<value>$principals_uids:$userguid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$principal%dnoslash:</key>
+				<value>$principals_users:$userid%d:</value>
+			</substitution>
+			<!-- relative path to user calendar home-->
+			<substitution>
+				<key>$pathprefix%d:</key>
+				<value>$calendars_uids:$userguid%d:</value>
+			</substitution>
+			<!-- relative path to user calendar-->
+			<substitution>
+				<key>$calendarpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to user inbox-->
+			<substitution>
+				<key>$inboxpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to user outbox-->
+			<substitution>
+				<key>$outboxpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to user dropbox-->
+			<substitution>
+				<key>$dropboxpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$dropbox:</value>
+			</substitution>
+			<!-- relative path to user freebusy-->
+			<substitution>
+				<key>$freebusypath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$freebusy:</value>
+			</substitution>
+			<!-- relative path to user alternate calendar home-->
+			<substitution>
+				<key>$calendarpathalt%d:</key>
+				<value>$calendars_users:$userid%d:/$calendar:</value>
+			</substitution>
+			<substitution>
+				<key>$email%d:</key>
+				<value>$userid%d:@example.com</value>
+			</substitution>
+			<!-- calendar user address of user-->
+			<substitution>
+				<key>$cuaddr%d:</key>
+				<value>mailto:$email%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddralt%d:</key>
+				<value>$principaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddraltnoslash%d:</key>
+				<value>$principals_uids:$userguid%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddrurn%d:</key>
+				<value>urn:uuid:$userguid%d:</value>
+			</substitution>
+		</repeat>
+
 		<!--  Override some of the above definitions for special cases -->
 
 		<!-- calendar user address of second user-->
 		<substitution>
 			<key>$cuaddr2:</key>
-			<value>MAILTO:user02 at example.com</value>
+			<value>MAILTO:$email2:</value>
 		</substitution>
 
 		<!-- resource id-->
@@ -286,6 +302,11 @@
 			<key>$resourceguid1:</key>
 			<value>resource01</value>
 		</substitution>
+		<!-- resource name-->
+		<substitution>
+			<key>$resourcename1:</key>
+			<value>Resource 01</value>
+		</substitution>
 		<!-- relative path to first resource calendar home-->
 		<substitution>
 			<key>$rpathprefix1:</key>
@@ -319,6 +340,10 @@
 			<key>$rcuaddralt1:</key>
 			<value>$rprincipaluri1:</value>
 		</substitution>
+		<substitution>
+			<key>$rcuaddrurn1:</key>
+			<value>urn:uuid:$resourceguid1:</value>
+		</substitution>
 
 		<!-- relative path to disabled group principal resource-->
 		<substitution>

Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2008-12-19 20:23:53 UTC (rev 3559)
@@ -159,6 +159,11 @@
 			<key>$useradmin:</key>
 			<value>admin</value>
 		</substitution>
+		<!-- guid for admin user -->
+		<substitution>
+			<key>$useradminguid:</key>
+			<value>admin</value>
+		</substitution>
 		<!-- password for admin user -->
 		<substitution>
 			<key>$pswdadmin:</key>
@@ -172,7 +177,7 @@
 		</substitution>
 		<substitution>
 			<key>$principaluri_admin:</key>
-			<value>$principals_uids:$useradmin:/</value>
+			<value>$principals_uids:$useradminguid:/</value>
 		</substitution>
 
 		<!-- user id for proxy user -->
@@ -186,69 +191,105 @@
 			<value>superuser</value>
 		</substitution>
 
-		<!-- user id -->
-		<substitution repeat="10">
-			<key>$userid%d:</key>
-			<value>user%02d</value>
-		</substitution>
-		<!-- user guid -->
-		<substitution repeat="10">
-			<key>$userguid%d:</key>
-			<value>user%02d</value>
-		</substitution>
-		<!-- password -->
-		<substitution repeat="10">
-			<key>$pswd%d:</key>
-			<value>user%02d</value>
-		</substitution>
-		<!-- relative path to first user principal resource-->
-		<substitution repeat="10">
-			<key>$principal%d:</key>
-			<value>$principals_users:$userid%d:/</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$principaluri%d:</key>
-			<value>$principals_uids:$userguid%d:/</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$principal%dnoslash:</key>
-			<value>$principals_users:$userid%d:</value>
-		</substitution>
-		<!-- relative path to first user calendar home-->
-		<substitution repeat="10">
-			<key>$pathprefix%d:</key>
-			<value>$calendars_uids:$userguid%d:</value>
-		</substitution>
-		<!-- relative path to first user calendar-->
-		<substitution repeat="10">
-			<key>$calendarpath%d:</key>
-			<value>$calendars_uids:$userguid%d:/$calendar:</value>
-		</substitution>
-		<!-- relative path to first user calendar home-->
-		<substitution repeat="10">
-			<key>$calendarpathalt%d:</key>
-			<value>$calendars_uids:$userid%d:/$calendar:</value>
-		</substitution>
-		<!-- calendar user address of first user-->
-		<substitution repeat="10">
-			<key>$cuaddr%d:</key>
-			<value>mailto:$userid%d:@example.com</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$cuaddralt%d:</key>
-			<value>$principaluri%d:</value>
-		</substitution>
-		<substitution repeat="10">
-			<key>$cuaddraltnoslash%d:</key>
-			<value>$principals_uids:$userguid%d:</value>
-		</substitution>
-		
+		<!--  Ten user accounts -->
+		<repeat count="10">
+			<!-- user id -->
+			<substitution>
+				<key>$userid%d:</key>
+				<value>user%02d</value>
+			</substitution>
+			<!-- user guid -->
+			<substitution>
+				<key>$userguid%d:</key>
+				<value>user%02d</value>
+			</substitution>
+			<!-- user name -->
+			<substitution>
+				<key>$username%d:</key>
+				<value>User %02d</value>
+			</substitution>
+			<!-- password -->
+			<substitution>
+				<key>$pswd%d:</key>
+				<value>user%02d</value>
+			</substitution>
+			<!-- relative path to user principal resource-->
+			<substitution>
+				<key>$principal%d:</key>
+				<value>$principals_users:$userid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$principaluri%d:</key>
+				<value>$principals_uids:$userguid%d:/</value>
+			</substitution>
+			<substitution>
+				<key>$principal%dnoslash:</key>
+				<value>$principals_users:$userid%d:</value>
+			</substitution>
+			<!-- relative path to user calendar home-->
+			<substitution>
+				<key>$pathprefix%d:</key>
+				<value>$calendars_uids:$userguid%d:</value>
+			</substitution>
+			<!-- relative path to user calendar-->
+			<substitution>
+				<key>$calendarpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$calendar:</value>
+			</substitution>
+			<!-- relative path to user inbox-->
+			<substitution>
+				<key>$inboxpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$inbox:</value>
+			</substitution>
+			<!-- relative path to user outbox-->
+			<substitution>
+				<key>$outboxpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$outbox:</value>
+			</substitution>
+			<!-- relative path to user dropbox-->
+			<substitution>
+				<key>$dropboxpath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$dropbox:</value>
+			</substitution>
+			<!-- relative path to user freebusy-->
+			<substitution>
+				<key>$freebusypath%d:</key>
+				<value>$calendars_uids:$userguid%d:/$freebusy:</value>
+			</substitution>
+			<!-- relative path to user alternate calendar home-->
+			<substitution>
+				<key>$calendarpathalt%d:</key>
+				<value>$calendars_users:$userid%d:/$calendar:</value>
+			</substitution>
+			<substitution>
+				<key>$email%d:</key>
+				<value>$userid%d:@example.com</value>
+			</substitution>
+			<!-- calendar user address of user-->
+			<substitution>
+				<key>$cuaddr%d:</key>
+				<value>mailto:$email%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddralt%d:</key>
+				<value>$principaluri%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddraltnoslash%d:</key>
+				<value>$principals_uids:$userguid%d:</value>
+			</substitution>
+			<substitution>
+				<key>$cuaddrurn%d:</key>
+				<value>urn:uuid:$userguid%d:</value>
+			</substitution>
+		</repeat>
+
 		<!--  Override some of the above definitions for special cases -->
 
 		<!-- calendar user address of second user-->
 		<substitution>
 			<key>$cuaddr2:</key>
-			<value>MAILTO:user02 at example.com</value>
+			<value>MAILTO:$email2:</value>
 		</substitution>
 
 		<!-- resource id-->
@@ -261,6 +302,11 @@
 			<key>$resourceguid1:</key>
 			<value>resource01</value>
 		</substitution>
+		<!-- resource name-->
+		<substitution>
+			<key>$resourcename1:</key>
+			<value>Resource 01</value>
+		</substitution>
 		<!-- relative path to first resource calendar home-->
 		<substitution>
 			<key>$rpathprefix1:</key>
@@ -271,6 +317,16 @@
 			<key>$rcalendarpath1:</key>
 			<value>$calendars_uids:$resourceguid1:/$calendar:</value>
 		</substitution>
+		<!-- relative path to first resource inbox-->
+		<substitution>
+			<key>$rinboxpath1:</key>
+			<value>$calendars_uids:$resourceguid1:/$inbox:</value>
+		</substitution>
+		<!-- relative path to first resource outbox-->
+		<substitution>
+			<key>$routboxpath1:</key>
+			<value>$calendars_uids:$resourceguid1:/$outbox:</value>
+		</substitution>
 		<!-- relative path to first resource principal resource-->
 		<substitution>
 			<key>$rprincipal1:</key>
@@ -284,6 +340,10 @@
 			<key>$rcuaddralt1:</key>
 			<value>$rprincipaluri1:</value>
 		</substitution>
+		<substitution>
+			<key>$rcuaddrurn1:</key>
+			<value>urn:uuid:$resourceguid1:</value>
+		</substitution>
 
 		<!-- relative path to disabled group principal resource-->
 		<substitution>

Modified: CalDAVTester/trunk/scripts/tests/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/acl.xml	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/scripts/tests/acl.xml	2008-12-19 20:23:53 UTC (rev 3559)
@@ -741,7 +741,7 @@
 						<value>DAV:principal-URL$&lt;href>$principaluri1:&lt;/href></value>
 						<value>DAV:group-member-set</value>
 						<value>DAV:group-membership</value>
-						<value>DAV:displayname$User 01</value>
+						<value>DAV:displayname$$username1:</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml	2008-12-19 20:23:53 UTC (rev 3559)
@@ -940,8 +940,8 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>notcontains</name>
-						<value>User 02</value>
-						<value>User 03</value>
+						<value>$username2:</value>
+						<value>$username3:</value>
 					</arg>
 				</verify>
 			</request>
@@ -1003,8 +1003,8 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>User 02</value>
-						<value>User 03</value>
+						<value>$username2:</value>
+						<value>$username3:</value>
 					</arg>
 				</verify>
 			</request>


Property changes on: CalDAVTester/trunk/scripts/tests/implicitoptions.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
   + /CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/implicitoptions.xml:3534-3558

Modified: CalDAVTester/trunk/scripts/tests/implicitscenario1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitscenario1.xml	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/scripts/tests/implicitscenario1.xml	2008-12-19 20:23:53 UTC (rev 3559)
@@ -213,7 +213,7 @@
 					<callback>propfindValues</callback>
 					<arg>
 						<name>props</name>
-						<value><![CDATA[http://calendarserver.org/ns/schedule-changes$<dtstamp>.*</dtstamp><action><reply><attendee>$cuaddr2:</attendee><partstat/></reply></action>]]></value>
+						<value><![CDATA[http://calendarserver.org/ns/schedule-changes$<dtstamp>.*</dtstamp><action><reply><attendee>$cuaddrurn2:</attendee><partstat/></reply></action>]]></value>
 					</arg>
 				</verify>
 			</request>
@@ -428,7 +428,7 @@
 					<callback>propfindValues</callback>
 					<arg>
 						<name>props</name>
-						<value><![CDATA[http://calendarserver.org/ns/schedule-changes$<dtstamp>.*</dtstamp><action><reply><attendee>$cuaddr2:</attendee><partstat/></reply></action>]]></value>
+						<value><![CDATA[http://calendarserver.org/ns/schedule-changes$<dtstamp>.*</dtstamp><action><reply><attendee>$cuaddrurn2:</attendee><partstat/></reply></action>]]></value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privateevents.xml	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/scripts/tests/privateevents.xml	2008-12-19 20:23:53 UTC (rev 3559)
@@ -545,6 +545,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -566,6 +570,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -587,6 +595,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -729,6 +741,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -750,6 +766,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -771,6 +791,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -806,6 +830,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -827,6 +855,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -865,6 +897,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PRIVATE</value>
 						<value>VERSION:2.0</value>
@@ -1048,6 +1084,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PRIVATE</value>
 						<value>VERSION:2.0</value>
@@ -1132,13 +1172,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 1</value>
 						<value>LOCATION:confidential 1</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -1155,6 +1199,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -1182,6 +1230,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -1346,13 +1398,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -1369,6 +1425,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -1396,6 +1456,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -1458,13 +1522,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 1</value>
 						<value>LOCATION:restricted 1</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -1481,6 +1549,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -1508,6 +1580,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -1675,13 +1751,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -1698,6 +1778,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -1725,6 +1809,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -1849,6 +1937,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -1871,6 +1963,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -1893,6 +1989,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -1918,13 +2018,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -1942,6 +2046,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -1951,8 +2059,8 @@
 						<name>notcontains</name>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -1970,6 +2078,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -1979,8 +2091,8 @@
 						<name>notcontains</name>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2001,13 +2113,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2025,6 +2141,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -2034,8 +2154,8 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2053,6 +2173,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -2062,8 +2186,8 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2084,12 +2208,16 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -2111,6 +2239,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -2120,8 +2252,8 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2139,6 +2271,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -2148,8 +2284,8 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2170,12 +2306,16 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -2197,6 +2337,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -2206,8 +2350,8 @@
 					<arg>
 						<name>notcontains</name>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2225,6 +2369,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -2234,8 +2382,8 @@
 					<arg>
 						<name>notcontains</name>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2323,6 +2471,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -2345,6 +2497,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -2367,6 +2523,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -2392,13 +2552,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2416,6 +2580,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -2425,8 +2593,8 @@
 						<name>notcontains</name>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2444,6 +2612,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -2453,8 +2625,8 @@
 						<name>notcontains</name>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2475,13 +2647,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2499,6 +2675,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -2508,8 +2688,8 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2527,6 +2707,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -2536,8 +2720,8 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2558,12 +2742,16 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -2585,6 +2773,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -2594,8 +2786,8 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2613,6 +2805,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -2622,8 +2818,8 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2644,12 +2840,16 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -2671,6 +2871,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -2680,8 +2884,8 @@
 					<arg>
 						<name>notcontains</name>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2699,6 +2903,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -2708,8 +2916,8 @@
 					<arg>
 						<name>notcontains</name>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
-						<value>ORGANIZER:$cuaddr1:</value>
-						<value>ATTENDEE:$cuaddr2:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -3108,6 +3316,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -3130,6 +3342,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -3152,6 +3368,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -3177,6 +3397,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -3200,6 +3424,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -3226,6 +3454,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -3255,6 +3487,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -3278,6 +3514,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -3304,6 +3544,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -3478,6 +3722,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -3500,6 +3748,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -3522,6 +3774,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -3547,6 +3803,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -3570,6 +3830,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -3596,6 +3860,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
@@ -3625,6 +3893,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -3648,6 +3920,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -3674,6 +3950,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
@@ -3818,6 +4098,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -3862,13 +4146,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -3886,12 +4174,16 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -3913,6 +4205,10 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:PUBLIC</value>
 						<value>VERSION:2.0</value>
@@ -3957,13 +4253,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -3981,13 +4281,17 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
+						<name>unwrap</name>
+						<value></value>
+					</arg>
+					<arg>
 						<name>contains</name>
 						<value>X-CALENDARSERVER-ACCESS:RESTRICTED</value>
 						<value>VERSION:2.0</value>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER:$cuaddr1:</value>
+						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>

Modified: CalDAVTester/trunk/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepost.xml	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/scripts/tests/schedulepost.xml	2008-12-19 20:23:53 UTC (rev 3559)
@@ -626,7 +626,7 @@
 					<callback>dataString</callback>
 					<arg>
 						<name>contains</name>
-						<value>ATTENDEE;CN=User 02:$cuaddraltnoslash2:</value>
+						<value>ATTENDEE;CN=$username2::$cuaddraltnoslash2:</value>
 					</arg>
 					<arg>
 						<name>unwrap</name>

Modified: CalDAVTester/trunk/src/serverinfo.py
===================================================================
--- CalDAVTester/trunk/src/serverinfo.py	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/src/serverinfo.py	2008-12-19 20:23:53 UTC (rev 3559)
@@ -99,24 +99,33 @@
             raise ValueError, "Must have $pswd1: substitution"
         self.pswd = self.subsdict["$pswd1:"]
 
+    def parseRepeatXML(self, node):
+        # Look for count
+        count = node.getAttribute( src.xmlDefs.ATTR_COUNT )
+
+        for child in node._get_childNodes():
+            self.parseSubstitutionXML(child, count)
+
     def parseSubstitutionsXML(self, node):
         for child in node._get_childNodes():
             if child._get_localName() == src.xmlDefs.ELEMENT_SUBSTITUTION:
-                
-                # Look for repeats
-                repeat = child.getAttribute( src.xmlDefs.ATTR_REPEAT )
+                self.parseSubstitutionXML(child)
+            elif child._get_localName() == src.xmlDefs.ELEMENT_REPEAT:
+                self.parseRepeatXML(child)
 
-                key = None
-                value = None
-                for schild in child._get_childNodes():
-                    if schild._get_localName() == src.xmlDefs.ELEMENT_KEY:
-                        key = schild.firstChild.data.encode("utf-8")
-                    elif schild._get_localName() == src.xmlDefs.ELEMENT_VALUE:
-                        value = schild.firstChild.data.encode("utf-8")
+    def parseSubstitutionXML(self, node, repeat=None):
+        if node._get_localName() == src.xmlDefs.ELEMENT_SUBSTITUTION:
+            key = None
+            value = None
+            for schild in node._get_childNodes():
+                if schild._get_localName() == src.xmlDefs.ELEMENT_KEY:
+                    key = schild.firstChild.data.encode("utf-8")
+                elif schild._get_localName() == src.xmlDefs.ELEMENT_VALUE:
+                    value = schild.firstChild.data.encode("utf-8")
 
-                if key and value:
-                    if repeat:
-                        for count in range(1, int(repeat)):
-                            self.subsdict[key % (count,)] = value % (count,)
-                    else:
-                        self.subsdict[key] = value
+            if key and value:
+                if repeat:
+                    for count in range(1, int(repeat)):
+                        self.subsdict[key % (count,)] = value % (count,)
+                else:
+                    self.subsdict[key] = value

Modified: CalDAVTester/trunk/src/xmlDefs.py
===================================================================
--- CalDAVTester/trunk/src/xmlDefs.py	2008-12-19 19:11:52 UTC (rev 3558)
+++ CalDAVTester/trunk/src/xmlDefs.py	2008-12-19 20:23:53 UTC (rev 3559)
@@ -48,6 +48,7 @@
 ELEMENT_POPULATE = "populate"
 ELEMENT_PORT = "port"
 ELEMENT_PROPERTY = "property"
+ELEMENT_REPEAT = "repeat"
 ELEMENT_REQUEST = "request"
 ELEMENT_RUNS = "runs"
 ELEMENT_RURI = "ruri"
@@ -82,7 +83,6 @@
 ATTR_NAME = "name"
 ATTR_PRINT_RESPONSE = "print-response"
 ATTR_PSWD = "pswd"
-ATTR_REPEAT = "repeat"
 ATTR_REQUEST_FAILED = "request-failed"
 ATTR_STATS = "stats"
 ATTR_SUBSTITUTIONS = "substitutions"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081219/2d160a4a/attachment-0001.html>


More information about the calendarserver-changes mailing list