From e8bc7b502790c4e0f10924cf49230f89c130020b Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Mon, 2 Nov 2009 12:41:42 +1300
Subject: [PATCH] Current regression test output reflecting recent
 enhancements.

---
 .../regression-suite/003-Mulberry-1.result    |  7 ++----
 .../regression-suite/005-Mulberry-1.result    |  8 ++----
 .../regression-suite/006-Mulberry-1.result    |  5 ++--
 .../013-Mulberry-PROPFIND-5.result            |  5 ++--
 .../015-Mulberry-PROPFIND-6.result            |  5 ++--
 .../205-Moz-PROPFIND-1.result                 |  5 ++--
 .../regression-suite/212-Moz-PROPFIND.result  |  5 ++--
 .../regression-suite/221-Moz-PROPFIND.result  |  5 ++--
 .../regression-suite/232-Moz-PROPFIND.result  |  5 ++--
 .../303-Chandler-PROPFIND-1.result            |  5 ++--
 .../304-Chandler-PROPFIND-2.result            |  5 ++--
 .../309-Chandler-PROPFIND-3.result            | 10 +++-----
 .../309-Chandler-PROPFIND-4.result            |  5 ++--
 .../401-Cadaver-PROPFIND-1.result             |  1 -
 .../regression-suite/502-iCal-PROPFIND.result |  8 ++----
 .../regression-suite/503-iCal-PROPFIND.result |  5 ++--
 .../regression-suite/504-iCal-PROPFIND.result |  5 ++--
 .../regression-suite/522-iCal-PROPFIND.result |  7 ++----
 .../regression-suite/524-iCal-PROPFIND.result |  7 ++----
 .../553-iPhone-PROPFIND.result                | 25 +++----------------
 .../554-iPhone-PROPFIND.result                | 25 +++----------------
 .../regression-suite/602-Soho-PROPFIND.result |  2 +-
 .../820-Spec-PROPFIND-1.result                |  1 -
 .../821-Spec-PROPFIND-2.result                |  3 +--
 .../822-Spec-PROPFIND-3.result                |  1 -
 .../824-Spec-PROPFIND-5.result                |  1 -
 .../regression-suite/832-freebusy.result      |  2 +-
 .../regression-suite/833-freebusy.result      |  2 +-
 .../regression-suite/836-freebusy.result      |  2 +-
 .../regression-suite/871-PROPFIND.result      |  5 ++--
 .../873-GroupDAV-PROPFIND.result              | 14 +++--------
 .../912-Space-PROPFIND.result                 |  8 ++----
 32 files changed, 59 insertions(+), 140 deletions(-)

diff --git a/testing/tests/regression-suite/003-Mulberry-1.result b/testing/tests/regression-suite/003-Mulberry-1.result
index dedf336d..73c78a7b 100644
--- a/testing/tests/regression-suite/003-Mulberry-1.result
+++ b/testing/tests/regression-suite/003-Mulberry-1.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "2ad651d00d49bd93e6b89aa3cf425073"
-Content-Length: 1505
+ETag: "16e4fc0882e84f344fcd98d73f4c80b8"
+Content-Length: 1441
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -30,7 +30,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -44,7 +43,6 @@ Content-Type: text/xml; charset="utf-8"
     <getcontentlength/>
     <resourcetype>
      <collection/>
-     <principal/>
      <C1:calendar-proxy-read/>
     </resourcetype>
    </prop>
@@ -59,7 +57,6 @@ Content-Type: text/xml; charset="utf-8"
     <getcontentlength/>
     <resourcetype>
      <collection/>
-     <principal/>
      <C1:calendar-proxy-write/>
     </resourcetype>
    </prop>
diff --git a/testing/tests/regression-suite/005-Mulberry-1.result b/testing/tests/regression-suite/005-Mulberry-1.result
index fca485ff..fa132f87 100644
--- a/testing/tests/regression-suite/005-Mulberry-1.result
+++ b/testing/tests/regression-suite/005-Mulberry-1.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "ea6f7e3236dc7831d1565787d84d55be"
-Content-Length: 1843
+ETag: "70a2c10638aba9246da7a22db61cbbed"
+Content-Length: 1751
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -30,7 +30,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -45,7 +44,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -59,7 +57,6 @@ Content-Type: text/xml; charset="utf-8"
     <getcontentlength/>
     <resourcetype>
      <collection/>
-     <principal/>
      <C1:calendar-proxy-read/>
     </resourcetype>
    </prop>
@@ -74,7 +71,6 @@ Content-Type: text/xml; charset="utf-8"
     <getcontentlength/>
     <resourcetype>
      <collection/>
-     <principal/>
      <C1:calendar-proxy-write/>
     </resourcetype>
    </prop>
diff --git a/testing/tests/regression-suite/006-Mulberry-1.result b/testing/tests/regression-suite/006-Mulberry-1.result
index 88aa15fb..57b08ac6 100644
--- a/testing/tests/regression-suite/006-Mulberry-1.result
+++ b/testing/tests/regression-suite/006-Mulberry-1.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "5f8ecaf86a38ff7709f798c29cb20590"
-Content-Length: 515
+ETag: "39d4f67fa9edfdf5cd70c47c9a9283da"
+Content-Length: 487
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -16,7 +16,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <getetag>"24c9e15e52afc47c225b757e7bee1f9d"</getetag>
    </prop>
diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
index 8022c052..4be7b893 100644
--- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
+++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "5747e43a52649b3441d9f8cff66c0e8f"
-Content-Length: 1083
+ETag: "c91d3ef1fe649702d889a87e62a17bee"
+Content-Length: 1055
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -16,7 +16,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
index 684ddb58..91acfa54 100644
--- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
+++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "48a3d4c6e9074f82e775ae6604591d2c"
-Content-Length: 1083
+ETag: "900e31bf9526042b25d3b3e172a21efa"
+Content-Length: 1055
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -16,7 +16,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/205-Moz-PROPFIND-1.result b/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
index 5784ba69..8640a1dc 100644
--- a/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
+++ b/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "af49e95c75e464601d516ba65f7dee49"
-Content-Length: 375
+ETag: "334c8abc0ac73261cdbf963fc7269d76"
+Content-Length: 347
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -14,7 +14,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/212-Moz-PROPFIND.result b/testing/tests/regression-suite/212-Moz-PROPFIND.result
index d96f6458..e2c81113 100644
--- a/testing/tests/regression-suite/212-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/212-Moz-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
 Content-Location: /caldav.php/user1/home/
-ETag: "af49e95c75e464601d516ba65f7dee49"
-Content-Length: 375
+ETag: "334c8abc0ac73261cdbf963fc7269d76"
+Content-Length: 347
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/221-Moz-PROPFIND.result b/testing/tests/regression-suite/221-Moz-PROPFIND.result
index c3637ef2..f766a968 100644
--- a/testing/tests/regression-suite/221-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/221-Moz-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "2f99fede961fd15bc30adf535a01f8d1"
-Content-Length: 539
+ETag: "7834e45733a7e28cc426ed001e07df74"
+Content-Length: 511
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -14,7 +14,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <A:getctag>"ce0d2291b1997c04cbc9d686d8cc3b40"</A:getctag>
     <owner>
diff --git a/testing/tests/regression-suite/232-Moz-PROPFIND.result b/testing/tests/regression-suite/232-Moz-PROPFIND.result
index 5784ba69..8640a1dc 100644
--- a/testing/tests/regression-suite/232-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/232-Moz-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "af49e95c75e464601d516ba65f7dee49"
-Content-Length: 375
+ETag: "334c8abc0ac73261cdbf963fc7269d76"
+Content-Length: 347
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -14,7 +14,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
index 0df7cae7..eb4236c9 100644
--- a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
+++ b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "47169ed9310a6c14d267c78c17a2496b"
-Content-Length: 475
+ETag: "08e937393d0e55c9d0696f5e48d9e18c"
+Content-Length: 447
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -14,7 +14,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <getetag>"f94fbdb733bc8367373bff1ec573ba36"</getetag>
diff --git a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
index 55470f6d..fabb976f 100644
--- a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
+++ b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "d9bed0f97ea7fc603a204227a589a5fd"
-Content-Length: 1198
+ETag: "7a5d19d17420dc10cae2a172cb9b8722"
+Content-Length: 1170
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -14,7 +14,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <getetag>"f94fbdb733bc8367373bff1ec573ba36"</getetag>
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result
index c2ad50b7..7a55400a 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result
@@ -1,9 +1,7 @@
-HTTP/1.1 207 Multi-Status
+HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "07474790757c5e1b526ce4901889d6d3"
-Content-Length: 68
-Content-Type: text/xml; charset="utf-8"
+Content-Length: 44
+Content-Type: text/plain; charset="utf-8"
 
-<?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:"/>
+That resource is not present on this server.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
index 616b9780..53da785d 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "943586f4f818ccaff360f46d7b8e97e5"
-Content-Length: 4267
+ETag: "5a857967af12b3c375f6880c8a5d2b54"
+Content-Length: 4239
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -14,7 +14,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <getetag>"f94fbdb733bc8367373bff1ec573ba36"</getetag>
diff --git a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
index 24d4b20b..716e810c 100644
--- a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
+++ b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
@@ -8,7 +8,6 @@
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
    </prop>
diff --git a/testing/tests/regression-suite/502-iCal-PROPFIND.result b/testing/tests/regression-suite/502-iCal-PROPFIND.result
index 90947a69..1366aebe 100644
--- a/testing/tests/regression-suite/502-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/502-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "a05ad6040b4257724f861b2940830057"
-Content-Length: 2432
+ETag: "1e048c7a336b37ab6c6dda2b9c852867"
+Content-Length: 2340
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -34,7 +34,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
    </prop>
@@ -55,7 +54,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>created</displayname>
    </prop>
@@ -75,7 +73,6 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <principal/>
      <C1:calendar-proxy-read/>
     </resourcetype>
     <displayname>/user1/calendar-proxy-read/</displayname>
@@ -96,7 +93,6 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <principal/>
      <C1:calendar-proxy-write/>
     </resourcetype>
     <displayname>/user1/calendar-proxy-write/</displayname>
diff --git a/testing/tests/regression-suite/503-iCal-PROPFIND.result b/testing/tests/regression-suite/503-iCal-PROPFIND.result
index a57e9d37..059cc323 100644
--- a/testing/tests/regression-suite/503-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/503-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "fcfd5dbd83ac87dbad74ae839c8f9693"
-Content-Length: 702
+ETag: "b4db34002394792db9dc2898aac13488"
+Content-Length: 674
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -14,7 +14,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <A:getctag>"2bf1cd7e851d3961aa84e201035fddda"</A:getctag>
diff --git a/testing/tests/regression-suite/504-iCal-PROPFIND.result b/testing/tests/regression-suite/504-iCal-PROPFIND.result
index d4e5f457..91029c58 100644
--- a/testing/tests/regression-suite/504-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/504-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "9953cc10c8f89c379815cd05912cf774"
-Content-Length: 4135
+ETag: "332f3e47f4ed97d37b5f0ac732d48574"
+Content-Length: 4107
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -14,7 +14,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <getetag>"2bf1cd7e851d3961aa84e201035fddda"</getetag>
    </prop>
diff --git a/testing/tests/regression-suite/522-iCal-PROPFIND.result b/testing/tests/regression-suite/522-iCal-PROPFIND.result
index 563d6aff..0cc9d07d 100644
--- a/testing/tests/regression-suite/522-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/522-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "ec88014cba0afd797ef66e9a50f7bd0d"
-Content-Length: 2427
+ETag: "e8148ec1b3d334d502d8817f4d424609"
+Content-Length: 2362
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -37,7 +37,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>user2 home</displayname>
     <C:getctag>"876883ebf6e5e80fb501f490c70803b5"</C:getctag>
@@ -60,7 +59,6 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-read/>
     </resourcetype>
     <displayname>/user2/calendar-proxy-read/</displayname>
@@ -84,7 +82,6 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-write/>
     </resourcetype>
     <displayname>/user2/calendar-proxy-write/</displayname>
diff --git a/testing/tests/regression-suite/524-iCal-PROPFIND.result b/testing/tests/regression-suite/524-iCal-PROPFIND.result
index 09281589..6d5d6658 100644
--- a/testing/tests/regression-suite/524-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/524-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "cc705bcb25130c21378d93e32747c072"
-Content-Length: 3601
+ETag: "0cbae0574458159ed341d1750dc67471"
+Content-Length: 3536
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -42,7 +42,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>manager1 home</displayname>
     <C:getctag>"c240642ddef994358c96da82c0361a58"</C:getctag>
@@ -66,7 +65,6 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-read/>
     </resourcetype>
     <C:calendar-proxy-read-for>
@@ -105,7 +103,6 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-write/>
     </resourcetype>
     <C:calendar-proxy-write-for/>
diff --git a/testing/tests/regression-suite/553-iPhone-PROPFIND.result b/testing/tests/regression-suite/553-iPhone-PROPFIND.result
index 7558f9ae..1d89965d 100644
--- a/testing/tests/regression-suite/553-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/553-iPhone-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "5771fd61ef8348f364c7fc69c578028a"
-Transfer-Encoding: chunked
+ETag: "fee4dee2807c6063429ae2b8914f0786"
+Content-Length: 8347
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -81,7 +81,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <C:getctag>"9a28f344c1e0032e5967806f193a7cb7"</C:getctag>
@@ -148,7 +147,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>created</displayname>
     <C:getctag>"bac273dae96780a3c8ed0c032266322c"</C:getctag>
@@ -215,7 +213,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>iCal Calendar</displayname>
     <C:getctag>"ac192d10783fff90598af2facc8259df"</C:getctag>
@@ -272,16 +269,8 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-read/</href>
   <propstat>
    <prop>
-    <C1:supported-calendar-component-set>
-     <C1:comp name="VEVENT"/>
-     <C1:comp name="VTODO"/>
-     <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-    </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-read/>
     </resourcetype>
     <displayname>/user1/calendar-proxy-read/</displayname>
@@ -329,6 +318,7 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set/>
     <C1:calendar-description/>
     <A:calendar-color/>
    </prop>
@@ -339,16 +329,8 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-write/</href>
   <propstat>
    <prop>
-    <C1:supported-calendar-component-set>
-     <C1:comp name="VEVENT"/>
-     <C1:comp name="VTODO"/>
-     <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-    </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-write/>
     </resourcetype>
     <displayname>/user1/calendar-proxy-write/</displayname>
@@ -396,6 +378,7 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set/>
     <C1:calendar-description/>
     <A:calendar-color/>
    </prop>
diff --git a/testing/tests/regression-suite/554-iPhone-PROPFIND.result b/testing/tests/regression-suite/554-iPhone-PROPFIND.result
index 7558f9ae..1d89965d 100644
--- a/testing/tests/regression-suite/554-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/554-iPhone-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "5771fd61ef8348f364c7fc69c578028a"
-Transfer-Encoding: chunked
+ETag: "fee4dee2807c6063429ae2b8914f0786"
+Content-Length: 8347
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -81,7 +81,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <C:getctag>"9a28f344c1e0032e5967806f193a7cb7"</C:getctag>
@@ -148,7 +147,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>created</displayname>
     <C:getctag>"bac273dae96780a3c8ed0c032266322c"</C:getctag>
@@ -215,7 +213,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>iCal Calendar</displayname>
     <C:getctag>"ac192d10783fff90598af2facc8259df"</C:getctag>
@@ -272,16 +269,8 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-read/</href>
   <propstat>
    <prop>
-    <C1:supported-calendar-component-set>
-     <C1:comp name="VEVENT"/>
-     <C1:comp name="VTODO"/>
-     <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-    </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-read/>
     </resourcetype>
     <displayname>/user1/calendar-proxy-read/</displayname>
@@ -329,6 +318,7 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set/>
     <C1:calendar-description/>
     <A:calendar-color/>
    </prop>
@@ -339,16 +329,8 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-write/</href>
   <propstat>
    <prop>
-    <C1:supported-calendar-component-set>
-     <C1:comp name="VEVENT"/>
-     <C1:comp name="VTODO"/>
-     <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-    </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-write/>
     </resourcetype>
     <displayname>/user1/calendar-proxy-write/</displayname>
@@ -396,6 +378,7 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set/>
     <C1:calendar-description/>
     <A:calendar-color/>
    </prop>
diff --git a/testing/tests/regression-suite/602-Soho-PROPFIND.result b/testing/tests/regression-suite/602-Soho-PROPFIND.result
index 6a0920e6..f3c8eafb 100644
--- a/testing/tests/regression-suite/602-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/602-Soho-PROPFIND.result
@@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
 ETag: "4391c4dac4fc275ca25641a267e12291"
-Transfer-Encoding: chunked
+Content-Length: 13164
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
index 295d5ca4..8ef6bfab 100644
--- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
+++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
@@ -9,7 +9,6 @@
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
index 50f7bae2..0dae1f95 100644
--- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
+++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
@@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
 ETag: "deadbeefcafefeeddeadbeefcafefeed"
-Content-Length: 1130
+Content-Length: 1102
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -16,7 +16,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
index 79261913..0a99b7a3 100644
--- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
+++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
@@ -9,7 +9,6 @@
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
index af0e8c51..cb828027 100644
--- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
+++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
@@ -9,7 +9,6 @@
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user1 home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
diff --git a/testing/tests/regression-suite/832-freebusy.result b/testing/tests/regression-suite/832-freebusy.result
index 080f337d..4ab92fa5 100644
--- a/testing/tests/regression-suite/832-freebusy.result
+++ b/testing/tests/regression-suite/832-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Transfer-Encoding: chunked
+Content-Length: 14409
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
diff --git a/testing/tests/regression-suite/833-freebusy.result b/testing/tests/regression-suite/833-freebusy.result
index 861868cf..fabe30a0 100644
--- a/testing/tests/regression-suite/833-freebusy.result
+++ b/testing/tests/regression-suite/833-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Transfer-Encoding: chunked
+Content-Length: 14409
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
diff --git a/testing/tests/regression-suite/836-freebusy.result b/testing/tests/regression-suite/836-freebusy.result
index 6c735b2b..a3ab4dff 100644
--- a/testing/tests/regression-suite/836-freebusy.result
+++ b/testing/tests/regression-suite/836-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Transfer-Encoding: chunked
+Content-Length: 14366
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
diff --git a/testing/tests/regression-suite/871-PROPFIND.result b/testing/tests/regression-suite/871-PROPFIND.result
index b677d059..739d9a5e 100644
--- a/testing/tests/regression-suite/871-PROPFIND.result
+++ b/testing/tests/regression-suite/871-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "d52f0e3e3e3613d59611af4ca000c3c6"
-Content-Length: 519
+ETag: "3d435cbdadc0a2ed3dc3c9ed7558b8e0"
+Content-Length: 491
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -14,7 +14,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C:calendar/>
-     <C:schedule-calendar/>
     </resourcetype>
     <displayname>user2 home</displayname>
     <A:getctag>"876883ebf6e5e80fb501f490c70803b5"</A:getctag>
diff --git a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result b/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result
index e509fb58..dada4c82 100644
--- a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result
+++ b/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result
@@ -1,23 +1,16 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "2838d6f29caac1487eb93606999277dc"
-Content-Length: 4835
+ETag: "8498716b46690758ce031acc2e8605dd"
+Content-Length: 4642
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A="http://calendarserver.org/ns/" xmlns:G="http://groupdav.org/" xmlns:C1="urn:ietf:params:xml:ns:carddav">
+<multistatus xmlns="DAV:" xmlns:A="http://calendarserver.org/ns/" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:G="http://groupdav.org/" xmlns:C1="urn:ietf:params:xml:ns:carddav">
  <response>
   <href>/caldav.php/</href>
   <propstat>
    <prop>
-    <C:supported-calendar-component-set>
-     <C:comp name="VEVENT"/>
-     <C:comp name="VTODO"/>
-     <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-    </C:supported-calendar-component-set>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <resourcetype>
      <collection/>
@@ -35,6 +28,7 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
+    <C:supported-calendar-component-set/>
     <G:component-set/>
     <C:calendar-description/>
     <C1:supported-address-data/>
diff --git a/testing/tests/regression-suite/912-Space-PROPFIND.result b/testing/tests/regression-suite/912-Space-PROPFIND.result
index 8e99720d..455c2a14 100644
--- a/testing/tests/regression-suite/912-Space-PROPFIND.result
+++ b/testing/tests/regression-suite/912-Space-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "cbdd4eaa0e099bc7a2dba03c79b70e16"
-Content-Length: 3086
+ETag: "c73f9be8b8862552e7cf90dbe97ca4f9"
+Content-Length: 2992
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -37,7 +37,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>User Six home</displayname>
     <C:getctag>"759d51f273f3a052dc930a6795f6e070"</C:getctag>
@@ -61,7 +60,6 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <C1:calendar/>
-     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>Space Calendar</displayname>
     <C:getctag>"d0711d9c33f6c22359ee83adb7751cda"</C:getctag>
@@ -84,7 +82,6 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-read/>
     </resourcetype>
     <displayname>/User Six/calendar-proxy-read/</displayname>
@@ -108,7 +105,6 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <principal/>
      <C:calendar-proxy-write/>
     </resourcetype>
     <displayname>/User Six/calendar-proxy-write/</displayname>