[Bedework-commit] webdav r212 - releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/shared

[svnadmin at bedework.org]

Author: douglm
Date: 2010-03-30 11:52:30 -0400 (Tue, 30 Mar 2010)
New Revision: 212

Modified:
   releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsNode.java
Log:
Fake up a root "/" collection for CalDAV. 

Add a "/" to the end of principal hrefs

Modified: releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsNode.java
===================================================================
--- releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsNode.java	2010-03-16 01:22:55 UTC (rev 211)
+++ releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsNode.java	2010-03-30 15:52:30 UTC (rev 212)
@@ -461,7 +461,11 @@
         if (intf.getAccount() == null) {
           xml.emptyTag(WebdavTags.unauthenticated);
         } else {
-          xml.property(WebdavTags.href, intf.makeUserHref(intf.getAccount()));
+          String href = intf.makeUserHref(intf.getAccount());
+          if (!href.endsWith("/")) {
+            href += "/";
+          }
+          xml.property(WebdavTags.href, href);
         }
         xml.closeTag(tag);
 
@@ -547,7 +551,11 @@
       if (tag.equals(WebdavTags.owner)) {
         // access 5.1
         xml.openTag(tag);
-        xml.property(WebdavTags.href, intf.makeUserHref(getOwner().getAccount()));
+        String href = getOwner().getPrincipalRef();
+        if (!href.endsWith("/")) {
+          href += "/";
+        }
+        xml.property(WebdavTags.href, href);
         xml.closeTag(tag);
 
         return true;