[CalendarServer-changes] [11459] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed Jul 3 19:15:52 PDT 2013


Revision: 11459
          http://trac.calendarserver.org//changeset/11459
Author:   cdaboo at apple.com
Date:     2013-07-03 19:15:52 -0700 (Wed, 03 Jul 2013)
Log Message:
-----------
Managed attachment behavior changed to accommodate event splitting.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/3.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/4.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/5.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/6.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/7.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/8.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/3.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/4.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/5.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/4.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/5.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/7.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/8.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/3.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/4.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/6.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/5.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/6.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/7.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/8.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/9.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharing/3.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/4.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/5.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/8.ics
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-dropbox.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/3.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/3.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/4.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/4.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/5.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/5.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/6.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/6.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2:;SCHEDULE-STATUS=2.0:$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/7.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/7.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/8.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-1/8.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/3.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/3.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/4.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/4.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/5.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-2/5.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2:;SCHEDULE-STATUS=2.0:$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/4.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/4.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2:;SCHEDULE-STATUS=1.2:$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/5.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/5.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/7.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/7.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2:;SCHEDULE-STATUS=1.2:$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/8.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-3/8.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id2:;MTAG=$mtag2:;FMTTYPE=$fmttype2:;FILENAME=$filename2:;SIZE=$size2::$attach2:
+ATTACH;MANAGED-ID=$managed_id2:;FMTTYPE=$fmttype2:;FILENAME=$filename2:;SIZE=$size2::$attach2:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/3.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/3.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/4.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/4.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/6.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-5/6.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2:;SCHEDULE-STATUS=1.2:$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/5.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/5.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/6.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/6.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/7.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/7.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,8 +7,8 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
-ATTACH;MANAGED-ID=$managed_id2:;MTAG=$mtag2:;FMTTYPE=$fmttype2:;FILENAME=$filename2:;SIZE=$size2::$attach2:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id2:;FMTTYPE=$fmttype2:;FILENAME=$filename2:;SIZE=$size2::$attach2:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/8.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/8.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2:;SCHEDULE-STATUS=1.2:$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/9.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/implicit-6/9.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,7 +7,7 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag2:;FMTTYPE=$fmttype2:;FILENAME=$filename2:;SIZE=$size2::$attach2:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype2:;FILENAME=$filename2:;SIZE=$size2::$attach2:
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharing/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharing/3.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharing/3.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -6,7 +6,7 @@
 DTSTART:$now.year.1:0101T140000Z
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/4.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/4.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -6,7 +6,7 @@
 DTSTART:$now.year.1:0101T140000Z
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/5.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/5.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,6 +7,6 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=1234;MTAG=abc;FMTTYPE=text/plain;FILENAME=foobar;SIZE=123:http://example.com/foorbar
+ATTACH;MANAGED-ID=1234;FMTTYPE=text/plain;FILENAME=foobar;SIZE=123:http://example.com/foorbar
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/7.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/7.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,6 +7,6 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=abc;FMTTYPE=text/plain;FILENAME=foobar;SIZE=123:http://example.com/foorbar
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=text/plain;FILENAME=foobar;SIZE=123:http://example.com/foorbar
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/8.ics	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/simple/8.ics	2013-07-04 02:15:52 UTC (rev 11459)
@@ -7,6 +7,6 @@
 DURATION:P1DT
 DTSTAMP:20051222T205953Z
 SUMMARY:event 1
-ATTACH;MANAGED-ID=$managed_id1:;MTAG=$mtag1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
+ATTACH;MANAGED-ID=$managed_id1:;FMTTYPE=$fmttype1:;FILENAME=$filename1:;SIZE=$size1::$attach1:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-dropbox.xml	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-dropbox.xml	2013-07-04 02:15:52 UTC (rev 11459)
@@ -172,7 +172,6 @@
 						<value>;FILENAME=</value>
 						<value>;FMTTYPE=</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml	2013-07-04 02:15:52 UTC (rev 11459)
@@ -81,10 +81,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
@@ -406,10 +402,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
@@ -713,10 +705,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
@@ -831,10 +819,6 @@
 					<variable>$managed_id2:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag2:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename2:</variable>
 				</grabcalparameter>
@@ -1185,10 +1169,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
@@ -1522,10 +1502,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
@@ -1615,10 +1591,6 @@
 					<variable>$managed_id2:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag2:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename2:</variable>
 				</grabcalparameter>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml	2013-07-04 02:15:52 UTC (rev 11459)
@@ -197,8 +197,7 @@
 						<value>;FILENAME=test2.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
-						<value>;MANAGED-ID=$managed-id:</value>
+						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml	2013-07-04 02:15:52 UTC (rev 11459)
@@ -185,7 +185,6 @@
 						<value>;FILENAME=test.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -260,25 +259,28 @@
 						<value>;FILENAME=test2.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
-						<value>;MANAGED-ID=$managed-id:</value>
 					</arg>
 					<arg>
 						<name>notcontains</name>
 						<value>;FILENAME=test.txt</value>
+						<value>;MANAGED-ID=$managed-id:</value>
 					</arg>
 				</verify>
 				<verify>
 					<callback>header</callback>
 					<arg>
 						<name>header</name>
-						<value>Cal-Managed-ID$$managed-id:</value>
+						<value>Cal-Managed-ID!$managed-id:</value>
 					</arg>
 				</verify>
 				<grabheader>
 					<name>Location</name>
 					<variable>$location2:</variable>
 				</grabheader>
+				<grabheader>
+					<name>Cal-Managed-ID</name>
+					<variable>$managed-id:</variable>
+				</grabheader>
 			</request>
 		</test>
 		<test name='5' ignore='no'>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml	2013-07-04 02:15:52 UTC (rev 11459)
@@ -679,10 +679,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
@@ -780,7 +776,7 @@
 						<value/>
 					</arg>
 					<arg>
-						<name>notcontains</name>
+						<name>contains</name>
 						<value>;MANAGED-ID=$managed_id1:</value>
 					</arg>
 				</verify>
@@ -797,10 +793,6 @@
 					<variable>$managed_id2:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag2:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename2:</variable>
 				</grabcalparameter>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml	2013-07-04 02:12:11 UTC (rev 11458)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml	2013-07-04 02:15:52 UTC (rev 11459)
@@ -189,7 +189,6 @@
 						<value>;FILENAME=</value>
 						<value>;FMTTYPE=</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=$managed-id:</value>
 						<value>:$location:</value>
 					</arg>
@@ -369,7 +368,6 @@
 						<value>;FILENAME=</value>
 						<value>;FMTTYPE=</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -425,7 +423,6 @@
 						<value>;FILENAME=</value>
 						<value>;FMTTYPE=</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=$managed-id:</value>
 						<value>:$location:</value>
 					</arg>
@@ -585,7 +582,6 @@
 						<value>;FILENAME=</value>
 						<value>;FMTTYPE=</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -716,7 +712,6 @@
 						<value>;FILENAME=</value>
 						<value>;FMTTYPE=</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -890,7 +885,6 @@
 						<value>;FILENAME=</value>
 						<value>;FMTTYPE=</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -986,7 +980,6 @@
 						<value>;FILENAME=</value>
 						<value>;FMTTYPE=</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=$managed-id:</value>
 						<value>:$location:</value>
 					</arg>
@@ -1103,7 +1096,6 @@
 						<value>;FILENAME=test.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -1178,7 +1170,10 @@
 						<value>;FILENAME=test2.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
+						<value>;MANAGED-ID=</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
 						<value>;MANAGED-ID=$managed-id:</value>
 					</arg>
 				</verify>
@@ -1186,13 +1181,17 @@
 					<callback>header</callback>
 					<arg>
 						<name>header</name>
-						<value>Cal-Managed-ID$$managed-id:</value>
+						<value>Cal-Managed-ID!$managed-id:</value>
 					</arg>
 				</verify>
 				<grabheader>
 					<name>Location</name>
 					<variable>$location2:</variable>
 				</grabheader>
+				<grabheader>
+					<name>Cal-Managed-ID</name>
+					<variable>$managed-id:</variable>
+				</grabheader>
 			</request>
 		</test>
 		<test name='5' ignore='no'>
@@ -1319,7 +1318,6 @@
 						<value>;FILENAME=test.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -1419,7 +1417,6 @@
 						<value>;FILENAME=</value>
 						<value>;FMTTYPE=</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=$managed-id:</value>
 						<value>:$location:</value>
 					</arg>
@@ -1554,7 +1551,6 @@
 						<value>;FILENAME=test.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -1578,10 +1574,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
@@ -1784,7 +1776,6 @@
 						<value>;FILENAME=test.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -1808,10 +1799,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
@@ -1870,7 +1857,7 @@
 						<value/>
 					</arg>
 					<arg>
-						<name>notcontains</name>
+						<name>contains</name>
 						<value>;MANAGED-ID=$managed_id1:</value>
 					</arg>
 				</verify>
@@ -1887,10 +1874,6 @@
 					<variable>$managed_id2:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag2:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename2:</variable>
 				</grabcalparameter>
@@ -1958,7 +1941,9 @@
 						<value>;FILENAME=test2.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
 						<value>;MANAGED-ID=$managed_id1:</value>
 					</arg>
 				</verify>
@@ -2162,7 +2147,6 @@
 						<value>;FILENAME=test.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -2186,10 +2170,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
@@ -2274,9 +2254,8 @@
 						<value/>
 					</arg>
 					<arg>
-						<name>notcontains</name>
+						<name>contains</name>
 						<value>;MANAGED-ID=$managed_id1:</value>
-						<value>None</value>
 					</arg>
 				</verify>
 				<grabheader>
@@ -2292,10 +2271,6 @@
 					<variable>$managed_id2:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag2:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename2:</variable>
 				</grabcalparameter>
@@ -2490,7 +2465,6 @@
 						<value>;FILENAME=test.txt</value>
 						<value>;FMTTYPE=text/plain</value>
 						<value>;SIZE=</value>
-						<value>;MTAG=</value>
 						<value>;MANAGED-ID=</value>
 					</arg>
 				</verify>
@@ -2514,10 +2488,6 @@
 					<variable>$managed_id1:</variable>
 				</grabcalparameter>
 				<grabcalparameter>
-					<name>VEVENT/ATTACH/MTAG</name>
-					<variable>$mtag1:</variable>
-				</grabcalparameter>
-				<grabcalparameter>
 					<name>VEVENT/ATTACH/FILENAME</name>
 					<variable>$filename1:</variable>
 				</grabcalparameter>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130703/a20049c1/attachment-0001.html>


More information about the calendarserver-changes mailing list