[Bedework-commit] caldav r172 - in trunk: bwcaldav/src/org/bedework/caldav/bwserver server/src/org/bedework/caldav/server

[svnadmin at bedework.org]

Author: douglm
Date: 2007-06-27 00:45:27 -0400 (Wed, 27 Jun 2007)
New Revision: 172

Modified:
   trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
   trunk/server/src/org/bedework/caldav/server/CaldavBwNode.java
Log:
CalDAV: return calendarHomeSet property

Modified: trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
===================================================================
--- trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2007-06-20 15:06:58 UTC (rev 171)
+++ trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2007-06-27 04:45:27 UTC (rev 172)
@@ -121,7 +121,7 @@
       this.account = account;
       this.debug = debug;
 
-      StringBuffer sb = new StringBuffer();
+      /*StringBuffer sb = new StringBuffer();
 
       sb.append("http://");
       sb.append(req.getLocalName());
@@ -132,7 +132,7 @@
         sb.append(port);
       }
 
-      sb.append(req.getContextPath());
+      sb.append(req.getContextPath());*/
 
       urlPrefix = WebdavUtils.getUrlPrefix(req);
     } catch (Throwable t) {

Modified: trunk/server/src/org/bedework/caldav/server/CaldavBwNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavBwNode.java	2007-06-20 15:06:58 UTC (rev 171)
+++ trunk/server/src/org/bedework/caldav/server/CaldavBwNode.java	2007-06-27 04:45:27 UTC (rev 172)
@@ -51,6 +51,7 @@
   private final static Collection<QName> supportedReports = new ArrayList<QName>();
 
   static {
+    addPropEntry(propertyNames, CaldavTags.calendarHomeSet);
     addPropEntry(propertyNames, CaldavTags.calendarUserAddressSet);
 
     supportedReports.add(CaldavTags.calendarMultiget); // Calendar access
@@ -161,6 +162,12 @@
         return true;
       }
 
+      if (tag.equals(CaldavTags.calendarHomeSet)) {
+        xml.property(tag, sysi.getUrlPrefix() +
+                     sysi.getCalUserInfo(getOwner(), false).userHomePath);
+        return true;
+      }
+
       // Not known - try higher
       return super.generatePropertyValue(tag, intf, allProp);
     } catch (WebdavException wde) {