[Bedework-commit] r491 - in trunk/calendar3: caldav/src/edu/rpi/cct/uwcal/caldav http/src/org/bedework/http/client/caldav

[svnadmin at bedework.org]

Author: douglm
Date: 2006-05-18 10:22:50 -0400 (Thu, 18 May 2006)
New Revision: 491

Modified:
   trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/MkcalendarMethod.java
   trunk/calendar3/http/src/org/bedework/http/client/caldav/CaldavClient.java
Log:
Enable mkcalendar method from client.


Modified: trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/MkcalendarMethod.java
===================================================================
--- trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/MkcalendarMethod.java	2006-05-18 13:59:01 UTC (rev 490)
+++ trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/MkcalendarMethod.java	2006-05-18 14:22:50 UTC (rev 491)
@@ -57,12 +57,14 @@
 import org.bedework.davdefs.CaldavTags;
 
 import edu.rpi.cct.webdav.servlet.common.PropPatchMethod;
+import edu.rpi.cct.webdav.servlet.common.Property;
 import edu.rpi.cct.webdav.servlet.shared.WebdavBadRequest;
 import edu.rpi.cct.webdav.servlet.shared.WebdavException;
 import edu.rpi.cct.webdav.servlet.shared.WebdavNsIntf;
 import edu.rpi.cct.webdav.servlet.shared.WebdavNsNode;
 
 import java.util.Collection;
+import java.util.Iterator;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -98,6 +100,7 @@
 
     WebdavNsNode node = getNsIntf().getNode(resourceUri);
 
+    // XXX Make calendar using properties sent in request
     getNsIntf().makeCollection(req, node);
 
     resp.setStatus(HttpServletResponse.SC_CREATED);
@@ -119,6 +122,20 @@
       }
 
       Collection setRemoveList = processUpdate(root);
+
+      Iterator it = setRemoveList.iterator();
+      while (it.hasNext()) {
+        Collection sr = (Collection)it.next();
+
+        if (!(sr instanceof PropPatchMethod.PropertySetList)) {
+          throw new WebdavBadRequest();
+        }
+
+        Iterator pit = sr.iterator();
+        while (pit.hasNext()) {
+          Property prop = (Property)pit.next();
+        }
+      }
     } catch (WebdavException wde) {
       throw wde;
     } catch (Throwable t) {

Modified: trunk/calendar3/http/src/org/bedework/http/client/caldav/CaldavClient.java
===================================================================
--- trunk/calendar3/http/src/org/bedework/http/client/caldav/CaldavClient.java	2006-05-18 13:59:01 UTC (rev 490)
+++ trunk/calendar3/http/src/org/bedework/http/client/caldav/CaldavClient.java	2006-05-18 14:22:50 UTC (rev 491)
@@ -77,7 +77,9 @@
   }
 
   public void setMethodName(String name, String uri) throws CalFacadeException {
-    if ("MKCOL".equals(name)) {
+    if ("MKCALENDAR".equals(name)) {
+      setMethod(new MkcalendarMethod(uri));
+    } else if ("MKCOL".equals(name)) {
       setMethod(new MkColMethod(uri));
     } else if ("PROPFIND".equals(name)) {
       setMethod(new PropFindMethod(uri));