Changeset 469

Timestamp:

05/12/06 12:37:23

Author:

douglm

Message:

Change getSpecialCalendar to optionally create. Avoids hibernate problem.

Change free/busy response to be at caldav12

Files:

• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java (modified) (2 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/CalendarsI.java (modified) (1 diff)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/ReportMethod.java (modified) (5 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (2 diffs)
• trunk/calendar3/config/configs/democal.options.xml (modified) (1 diff)
• trunk/calendar3/config/configs/democal.properties (modified) (1 diff)
• trunk/calendar3/icalendar/src/org/bedework/icalendar/IcalTranslator.java (modified) (7 diffs)

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java

@@ -285 +285 @@
-
-  public BwCalendar getSpecialCalendar(BwUser user,
-
+
+
-    StringBuffer sb = new StringBuffer();
-    String name;
@@ -316 +317 @@
-    BwCalendar cal = getCalendar(sb.toString(), privRead);
-
-cal != null
+(cal != null) || !create
-      return cal;
-    }

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java

@@ -871 +871 @@
-
-  public BwCalendar getSpecialCalendar(BwUser user,
-
-
+
+
+
-  }
-
@@ -1123 +1124 @@
-
-  public Collection getDeletedProxies() throws CalFacadeException {
-
+, false
-
-    if (cal == null) {
-
+ or never deleted anything
-      return new ArrayList();
-    }

trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java

@@ -473 +473 @@
-
-  public BwCalendar getSpecialCalendar(BwUser user,
-
+
+
-    throw new CalFacadeUnimplementedException();
-  }

trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/CalendarsI.java

@@ -188 +188 @@
-   * @param  user
-   * @param  calType   int special calendar type.
+   * @param  create    true if we shoudl create it if non-existant.
-   * @return BwCalendar null for unknown calendar
-   * @throws CalFacadeException
-   */
-  public BwCalendar getSpecialCalendar(BwUser user,
-
+
+
-
-  /** Add a calendar object

trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/ReportMethod.java

@@ -76 +76 @@
-import org.w3c.dom.Element;
-
+import java.io.Reader;
+import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collection;
@@ -140 +142 @@
-    }
-
-
+
+
+
+
+
-  }
-
@@ -386 +392 @@
-        }
-      }
-    } else if (reportType == reportTypeFreeBusy) {
-      try {
-        nodes = intf.getFreeBusy(node, freeBusy);
-      } catch (WebdavException wde) {
-        if (debug) {
-          trace("intf.getFreeBusy exception");
-        }
-        status = wde.getStatusCode();
-      }
-    } else if (reportType == reportTypeExpandProperty) {
-    }
@@ -417 +414 @@
-
-    flush();
+  }
+
+  /** Handle free/busy response
+   *
+   * @param req
+   * @param resp
+   * @param depth
+   * @throws WebdavException
+   */
+  public void processFbResp(HttpServletRequest req,
+                            HttpServletResponse resp) throws WebdavException {
+    resp.setStatus(HttpServletResponse.SC_OK);
+    resp.setContentType("text/calendar; charset=UTF-8");
+
+    String resourceUri = getResourceUri(req);
+
+    CaldavBWIntf intf = (CaldavBWIntf)getNsIntf();
+    WebdavNsNode node = intf.getNode(resourceUri);
+
+    int status = HttpServletResponse.SC_OK;
+
+    Collection nodes = null;
+
+    try {
+      nodes = intf.getFreeBusy(node, freeBusy);
+    } catch (WebdavException wde) {
+      if (debug) {
+        trace("intf.getFreeBusy exception");
+      }
+      status = wde.getStatusCode();
+    }
+
+    if (status != HttpServletResponse.SC_OK) {
+      if (debug) {
+        trace("REPORT status " + status);
+      }
+      // Entire request failed.
+      node.setStatus(status);
+      doNode(node);
+    } else if (nodes != null) {
+      Iterator it = nodes.iterator();
+
+      // XXX Only one node?
+      while (it.hasNext()) {
+        WebdavNsNode curnode = (WebdavNsNode)it.next();
+
+        if (!(node instanceof CaldavCalNode)) {
+          if (debug) {
+            trace("Expected CaldavCalNode - got " + node);
+          }
+          status = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+        } else {
+          CaldavCalNode cnode = (CaldavCalNode)node;
+
+          Writer out;
+          try {
+            out = resp.getWriter();
+          } catch (Throwable t) {
+            throw new WebdavException(t);
+          }
+
+          /** Get the content now to set up length, type etc.
+           */
+          Reader in = getNsIntf().getContent(node);
+          resp.setContentLength(node.getContentLen());
+          if (in == null) {
+            if (debug) {
+              debugMsg("status: " + HttpServletResponse.SC_NO_CONTENT);
+            }
+
+            resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
+          } else {
+            if (debug) {
+              debugMsg("send content - length=" + node.getContentLen());
+            }
+
+            writeContent(in, out);
+          }
+        }
+      }
+    }
+
+    flush();
+  }
+
+  // XXX Make the following part of the interface.
+
+  /** size of buffer used for copying content to response.
+   */
+  private static final int bufferSize = 4096;
+
+  private void writeContent(Reader in, Writer out)
+      throws WebdavException {
+    try {
+      char[] buff = new char[bufferSize];
+      int len;
+
+      while (true) {
+        len = in.read(buff);
+
+        if (len < 0) {
+          break;
+        }
+
+        out.write(buff, 0, len);
+      }
+    } catch (Throwable t) {
+      throw new WebdavException(t);
+    } finally {
+      try {
+        in.close();
+      } catch (Throwable t) {}
+      try {
+        out.close();
+      } catch (Throwable t) {}
+    }
-  }
-
@@ -440 +553 @@
-          }
-        }
-      } else if (reportType == reportTypeFreeBusy) {
-        if (!(node instanceof CaldavCalNode)) {
-          if (debug) {
-            trace("Expected CaldavCalNode - got " + node);
-          }
-          status = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-        } else {
-          CaldavCalNode cnode = (CaldavCalNode)node;
-
-          content = cnode.getContentString();
-        }
-      }
-    }

trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

@@ -1702 +1702 @@
-      event.setDeleted(true);
-      event.setCalendar(getCal().getSpecialCalendar(event.getOwner(),
-
+
+
-      updateEvent(event);
-      return;
@@ -1712 +1713 @@
-
-    // Where does the ref go? Not in the same calendar - we have no access
-    // Put it in the trash - but don't delete on empty trash
-
-    BwCalendar cal = getCal().getSpecialCalendar(getUser(),
-
+
+
-    proxy.setOwner(getUser());
-    proxy.setDeleted(true);

trunk/calendar3/config/configs/democal.options.xml

@@ -38 +38 @@
-        <defaultUserViewName>All</defaultUserViewName>
-
-
+public-
-
-        <httpConnectionsPerUser>10</httpConnectionsPerUser>

trunk/calendar3/config/configs/democal.properties

@@ -214 +214 @@
-org.bedework.app.dumpres.description=Bedework dump/restore utility
-org.bedework.app.dumpres.version=3.1
-org.bedework.app.dumpres.dumpfile=${calendar.dir}/dumprestore/initcaldata.xml
-org.bedework.app.dumpres.hibernate.dialect=org.hibernate.dialect.HSQLDialect
-org.bedework.app.dumpres.jdbcdriver=org.hsqldb.jdbcDriver

trunk/calendar3/icalendar/src/org/bedework/icalendar/IcalTranslator.java

@@ -57 +57 @@
-import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.BwFreeBusy;
-import org.bedework.calfacade.BwUser;
-import org.bedework.calfacade.CalFacadeException;
@@ -69 +70 @@
-import net.fortuna.ical4j.model.Calendar;
-import net.fortuna.ical4j.model.component.VEvent;
+import net.fortuna.ical4j.model.component.VFreeBusy;
-import net.fortuna.ical4j.model.component.VTimeZone;
-import net.fortuna.ical4j.model.Component;
@@ -81 +83 @@
-import java.io.StringWriter;
-import java.io.Serializable;
+import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
@@ -260 +263 @@
-  }
-
-
-
-
-
+
+
-   *
-   * @param cal       calendar
@@ -272 +273 @@
-  public Collection fromIcal(BwCalendar cal, String val) throws CalFacadeException {
-    return fromIcal(cal, new StringReader(val));
-    /*
-    try {
-      CalendarBuilder bldr = new CalendarBuilder(new CalendarParserImpl());
-
-      UnfoldingReader ufrdr = new UnfoldingReader(new StringReader(val), true);
-
-      //return fromIcal(cal, bldr.build(new UnfoldingReader(new StringReader(val))));
-      return fromIcal(cal, bldr.build(ufrdr));
-    } catch (ParserException pe) {
-      if (debug) {
-        error(pe);
-      }
-      throw new IcalMalformedException(pe.getMessage());
-    } catch (CalFacadeException cfe) {
-      throw cfe;
-    } catch (Throwable t) {
-      throw new CalFacadeException(t);
-    }*/
-  }
-
@@ -326 +309 @@
-   */
-  public Collection fromIcal(BwCalendar cal, Calendar val) throws CalFacadeException {
-Vector objs = new Vector
+ArrayList objs = new ArrayList
-
-    if (val == null) {
@@ -344 +327 @@
-        if (ev != null) {
-          objs.add(ev);
+        }
+      } else if (o instanceof VFreeBusy) {
+        BwFreeBusy fb = BwFreeBusyUtil.toFreeBusy(cb,
+                                                  (VFreeBusy)o,
+                                                  debug);
+
+        if (fb != null) {
+          objs.add(fb);
-        }
-      } else if (o instanceof VTimeZone) {