From 25ba6f8e0db1ef330fab791c33e0942e20debf68 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Sun, 10 Dec 2006 23:09:51 +1300
Subject: [PATCH] All those resource types are hopefully right now.

---
 .../013-Mulberry-PROPFIND-5.result            | 12 ++++-------
 .../015-Mulberry-PROPFIND-6.result            | 12 ++++-------
 .../309-Chandler-PROPFIND-4.result            | 16 +++++----------
 .../822-Spec-PROPFIND-3.result                | 20 +++++--------------
 .../823-Spec-PROPFIND-4.result                | 13 +++++++++---
 5 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
index c6b4be18..fb254131 100644
--- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
+++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "ac2b6af130887ffe680c3013cc305155"
-Content-Length: 1199
+ETag: "e5c080bf0c8c4ed1217717f1ce94c6cd"
+Content-Length: 1051
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -26,9 +26,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <getcontentlength>705</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -39,9 +37,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <getcontentlength>720</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
index 028fd3d3..5d0ccbe9 100644
--- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
+++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "0f519d4aaa6e2d0f9ac420a20e0a6932"
-Content-Length: 1199
+ETag: "f87770eaf4d08281e321f4a3321a023e"
+Content-Length: 1051
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -26,9 +26,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <getcontentlength>747</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -39,9 +37,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <getcontentlength>720</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
index b2b89ba2..7d6aca76 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "feba2ed0f64f3f0094ec5e5546ea8c82"
-Content-Length: 1578
+ETag: "a4356a6de9de23ce6f64c368f195d78c"
+Content-Length: 1356
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -24,9 +24,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
   <propstat>
    <prop>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
     <displayname>A Meeting</displayname>
     <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
    </prop>
@@ -37,9 +35,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
   <propstat>
    <prop>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
     <displayname>Lunch with David</displayname>
     <getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
    </prop>
@@ -50,9 +46,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
   <propstat>
    <prop>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
     <displayname>Weekly Project Meeting</displayname>
     <getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
    </prop>
diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
index 238f6616..970e47d4 100644
--- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
+++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
@@ -37,9 +37,7 @@
     <getcontentlength>1059</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
     <displayname>A Meeting</displayname>
     <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
     <getcontentlanguage>en_NZ</getcontentlanguage>
@@ -65,9 +63,7 @@
     <getcontentlength>747</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
     <displayname>Lunch with David</displayname>
     <getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
     <getcontentlanguage>en_NZ</getcontentlanguage>
@@ -93,9 +89,7 @@
     <getcontentlength>999</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
     <displayname>Weekly Project Meeting</displayname>
     <getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
     <getcontentlanguage>en_NZ</getcontentlanguage>
@@ -121,9 +115,7 @@
     <getcontentlength>743</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
     <displayname>Beer O'Clock</displayname>
     <getetag>"0d7a68984bf525342d22b8924a57e8e2"</getetag>
     <getcontentlanguage>en_NZ</getcontentlanguage>
@@ -149,9 +141,7 @@
     <getcontentlength>302</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
     <displayname>Morning Mgmt Mtg</displayname>
     <getetag>"421abf7e4848d2fecbf64217ed205d4b"</getetag>
     <getcontentlanguage>en_NZ</getcontentlanguage>
diff --git a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
index 6b9c3947..8df81d79 100644
--- a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
+++ b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
@@ -8,11 +8,18 @@
     <getcontentlength>302</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
+    <resourcetype/>
     <displayname>Morning Mgmt Mtg</displayname>
     <getetag>"421abf7e4848d2fecbf64217ed205d4b"</getetag>
+    <acl>
+     <ace>
+      <principal>
+       <authenticated/>
+      </principal>
+      <grant>
+      </grant>
+     </ace>
+    </acl>
     <getcontentlanguage>en_NZ</getcontentlanguage>
     <supportedlock>
      <lockentry>