Changeset 507

Timestamp:

05/25/06 09:34:51

Author:

douglm

Message:

Mostly fixes to caldav for the calconnect interop.

Some restructuring to free/busy code and rearrangement of Calintf

Files:

• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (modified) (23 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Events.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwEvent.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwFreeBusyComponent.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeException.java (modified) (6 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java (modified) (5 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java (modified) (47 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/Calintf.java (modified) (5 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CalDavOptionsMethod.java (added)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java (modified) (3 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWServlet.java (modified) (1 diff)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBwNode.java (modified) (2 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavCalNode.java (modified) (1 diff)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/MkcalendarMethod.java (modified) (3 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/calquery/FreeBusyQuery.java (modified) (1 diff)
• trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/common/OptionsMethod.java (modified) (3 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/common/PropPatchMethod.java (modified) (2 diffs)
• trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/CalintfCaldavImpl.java (modified) (16 diffs)
• trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java (modified) (6 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (18 diffs)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java (modified) (3 diffs)
• trunk/calendar3/freebusyServer/src/org/bedework/freebusyServer/FreeBusyAggregator.java (modified) (3 diffs)
• trunk/calendar3/test/caldavTestData/eg/content/eg02.xml (modified) (1 diff)
• trunk/calendar3/test/caldavTestData/eg/content/eg20.xml (modified) (1 diff)
• trunk/calendar3/test/caldavTestData/eg/eg12.test (modified) (1 diff)
• trunk/calendar3/test/caldavTestData/eg/eg16.test (modified) (1 diff)
• trunk/calendar3/test/caldavTestData/eg/eg17.test (modified) (1 diff)
• trunk/calendar3/test/caldavTestData/eg/eg22.test (added)
• trunk/calendar3/test/src/org/bedework/tests/caldav/Req.java (modified) (4 diffs)
• trunk/calendar3/test/src/org/bedework/tests/caldav/TestCalDav.java (modified) (1 diff)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java (modified) (2 diffs)

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

@@ -62 +62 @@
-import org.bedework.calfacade.BwCategory;
-import org.bedework.calfacade.BwDateTime;
+import org.bedework.calfacade.BwDuration;
-import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.BwFreeBusy;
+import org.bedework.calfacade.BwFreeBusyComponent;
-import org.bedework.calfacade.BwLocation;
+import org.bedework.calfacade.BwPrincipal;
-import org.bedework.calfacade.BwRWStats;
-import org.bedework.calfacade.BwSponsor;
@@ -76 +80 @@
-import org.bedework.calfacade.CalFacadeDefs;
-import org.bedework.calfacade.CalFacadeException;
+import org.bedework.calfacade.CalFacadeUtil;
-import org.bedework.calfacade.CoreEventInfo;
+import org.bedework.calfacade.CalFacadeUtil.EventPeriod;
+import org.bedework.calfacade.CalFacadeUtil.GetPeriodsPars;
-import org.bedework.calfacade.base.BwShareableDbentity;
+import org.bedework.calfacade.base.CalintfBase;
-import org.bedework.calfacade.filter.BwFilter;
-import org.bedework.calfacade.ifs.CalTimezones;
-import org.bedework.calfacade.ifs.Calintf;
-import org.bedework.calfacade.ifs.CalintfInfo;
-import org.bedework.calfacade.ifs.EventsI;
-import org.bedework.calfacade.ifs.Groups;
+import org.bedework.calfacade.svc.EventInfo;
-import org.bedework.icalendar.IcalTranslator;
-
@@ -89 +97 @@
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Iterator;
-import java.util.TreeSet;
-
-import net.fortuna.ical4j.model.Calendar;
-import net.fortuna.ical4j.model.Component;
+import net.fortuna.ical4j.model.DateTime;
+import net.fortuna.ical4j.model.Period;
-import net.fortuna.ical4j.model.component.VTimeZone;
-
@@ -131 +142 @@
- * @author Mike Douglass   douglm@rpi.edu
- */
-
-
-
+
-  private BwSystem syspars;
-
@@ -150 +159 @@
-  private AccessUtil access;
-
-  /** Ensure we don't open while open
-   */
-  private boolean isOpen;
-
-  /* * This is all the personal calendars modified while the current transaction
-   *  has been in progress. Just before commit we update the lastmod off all
-   *  the users on this list.
-   * /
-  private Vector personalModified;
-  */
-
-  /** User for whom we maintain this facade
-   */
-  private BwUser user;
-
-  private EventsI events;
-
@@ -174 +168 @@
-
-  private EventProperties sponsors;
-
-  private int currentMode = CalintfUtil.guestMode;
-
-  /** Non-null if this is for synchronization. Identifies the client end.
-   */
-  private String synchId;
-
-  /** Prevent updates.
@@ -213 +201 @@
-  }
-
-  private transient Logger log;
-
-  /** When we were created for debugging */
-  private Timestamp objTimestamp;
-
-  /* ====================================================================
-   *                   initialisation
@@ -225 +208 @@
-   * @see org.bedework.calfacade.Calintf#init(org.bedework.calfacade.BwUser, java.lang.String, boolean, boolean, boolean, java.lang.String, boolean)
-   */
-
+
+
-                      String user,
-                      boolean publicAdmin,
@@ -231 +215 @@
-                      String synchId,
-                      boolean debug) throws CalFacadeException {
-
+
+
+
-    boolean userCreated = false;
-
@@ -238 +224 @@
-    try {
-      access = new AccessUtil(debug);
-
-      objTimestamp = new Timestamp(System.currentTimeMillis());
-
-      this.synchId = synchId;
-      log = Logger.getLogger(getClass());
-
-      if ((synchId != null) && publicAdmin) {
@@ -327 +308 @@
-  }
-
+  public void logon(BwUser val) throws CalFacadeException {
+    checkOpen();
+    Timestamp now = new Timestamp(System.currentTimeMillis());
+
+    val.setLogon(now);
+    val.setLastAccess(now);
+    sess.update(val);
+  }
+
-  public void setSuperUser(boolean val) {
-    access.setSuperUser(val);
@@ -421 +411 @@
-  }
-
-  public boolean getDebug() throws CalFacadeException {
-    return debug;
-  }
-
-  public void setUser(String val) throws CalFacadeException {
-    refreshEvents();
-
-    user = getUser(val);
-    if (this.user == null) {
-      throw new CalFacadeException("User " + val + " does not exist.");
-    }
-
-    logon(user);
-
-    if (debug) {
-      log.debug("User " + val + " set in calintf");
-    }
-  }
-
-  /* ====================================================================
-   *                   Misc methods
@@ -446 +417 @@
-  public void flushAll() throws CalFacadeException {
-    if (debug) {
-log.
+
-    }
-    if (sess == null) {
@@ -472 +443 @@
-    if (sess == null) {
-      if (debug) {
-log.
-
-log
+
+
+getLogger()
-    } else {
-      if (debug) {
-log.
+
-      }
-      sess.reconnect();
@@ -492 +463 @@
-    if (!isOpen) {
-      if (debug) {
-log.
+
-      }
-      return;
@@ -498 +469 @@
-
-    if (debug) {
-log.
+
-    }
-
@@ -526 +497 @@
-//    sess.close();
-    if (debug) {
-log.
+
-    }
-    sess.beginTransaction();
@@ -535 +506 @@
-
-    if (debug) {
-log.
+
-    }
-
@@ -604 +575 @@
-   *                   Users
-   * ==================================================================== */
-
-  public BwUser getUser() throws CalFacadeException {
-    return user;
-  }
-
-  public BwUser getUser(int id) throws CalFacadeException {
@@ -656 +623 @@
-  }
-
-  public void updateUser() throws CalFacadeException {
-    updateUser(getUser());
-  }
-
-  public void updateUser(BwUser user) throws CalFacadeException {
-    checkOpen();
@@ -682 +645 @@
-    throw new CalFacadeException("Unimplemented");
-  }*/
-
-  private void logon(BwUser val) throws CalFacadeException {
-    checkOpen();
-    Timestamp now = new Timestamp(System.currentTimeMillis());
-
-    val.setLogon(now);
-    val.setLastAccess(now);
-    sess.update(val);
-  }
-
-  /* ====================================================================
@@ -1079 +1033 @@
-
-    return sponsors.getRefs(val);
+  }
+
+  /* ====================================================================
+   *                   Free busy
+   * ==================================================================== */
+
+  public BwFreeBusy getFreeBusy(BwCalendar cal, BwPrincipal who,
+                                BwDateTime start, BwDateTime end,
+                                BwDuration granularity,
+                                boolean returnAll,
+                                boolean ignoreTransparency)
+          throws CalFacadeException {
+    if (!(who instanceof BwUser)) {
+      throw new CalFacadeException("Unsupported: non user principal for free-busy");
+    }
+
+    Collection events = getFreeBusyEntities(cal, start, end, ignoreTransparency);
+    BwFreeBusy fb = new BwFreeBusy(who, start, end);
+
+    try {
+      if (granularity != null) {
+        // chunked.
+        GetPeriodsPars gpp = new GetPeriodsPars();
+
+        gpp.events = events;
+        gpp.startDt = start;
+        gpp.dur = granularity;
+        gpp.tzcache = getTimezones();
+
+        BwFreeBusyComponent fbc = null;
+
+        if (!returnAll) {
+          // One component
+          fbc = new BwFreeBusyComponent();
+          fb.addTime(fbc);
+        }
+
+        int limit = 10000; // XXX do this better
+
+        /* endDt is null first time through, then represents end of last
+         * segment.
+         */
+        while ((gpp.endDt == null) || (gpp.endDt.before(end))) {
+          //if (debug) {
+          //  trace("gpp.startDt=" + gpp.startDt + " end=" + end);
+          //}
+          if (limit < 0) {
+            throw new CalFacadeException("org.bedework.svci.limit.exceeded");
+          }
+          limit--;
+
+          Collection periodEvents = CalFacadeUtil.getPeriodsEvents(gpp);
+
+          if (returnAll) {
+            fbc = new BwFreeBusyComponent();
+            fb.addTime(fbc);
+
+            DateTime psdt = new DateTime(gpp.startDt.getDtval());
+            DateTime pedt = new DateTime(gpp.endDt.getDtval());
+
+            psdt.setUtc(true);
+            pedt.setUtc(true);
+            fbc.addPeriod(new Period(psdt, pedt));
+            if (periodEvents.size() == 0) {
+              fbc.setType(BwFreeBusyComponent.typeFree);
+            }
+          } else if (periodEvents.size() != 0) {
+            /* Some events fall in the period. Add an entry.
+             * We eliminated cancelled events earler. Now we should set the
+             * free/busy type based on the events status.
+             */
+
+            DateTime psdt = new DateTime(gpp.startDt.getDtval());
+            DateTime pedt = new DateTime(gpp.endDt.getDtval());
+
+            psdt.setUtc(true);
+            pedt.setUtc(true);
+
+            if (fbc == null) {
+              fbc = new BwFreeBusyComponent();
+              fb.addTime(fbc);
+            }
+
+            fbc.addPeriod(new Period(psdt, pedt));
+          }
+        }
+
+        return fb;
+      }
+
+      Iterator it = events.iterator();
+
+      TreeSet eventPeriods = new TreeSet();
+
+      while (it.hasNext()) {
+        EventInfo ei = (EventInfo)it.next();
+        BwEvent ev = ei.getEvent();
+
+        if (BwEvent.statusCancelled.equals(ev.getStatus())) {
+          // Ignore this one.
+          continue;
+        }
+
+        // Ignore if times were specified and this event is outside the times
+
+        BwDateTime estart = ev.getDtstart();
+        BwDateTime eend = ev.getDtend();
+
+        /* Don't report out of the requested period */
+
+        String dstart;
+        String dend;
+
+        if (estart.before(start)) {
+          dstart = start.getDtval();
+        } else {
+          dstart = estart.getDtval();
+        }
+
+        if (eend.after(end)) {
+          dend = end.getDtval();
+        } else {
+          dend = eend.getDtval();
+        }
+
+        DateTime psdt = new DateTime(dstart);
+        DateTime pedt = new DateTime(dend);
+
+        psdt.setUtc(true);
+        pedt.setUtc(true);
+
+        int type = BwFreeBusyComponent.typeBusy;
+
+        if (BwEvent.statusTentative.equals(ev.getStatus())) {
+          type = BwFreeBusyComponent.typeBusyTentative;
+       }
+
+        eventPeriods.add(new EventPeriod(psdt, pedt, type));
+      }
+
+      /* iterate through the sorted periods combining them where they are
+       adjacent or overlap */
+
+      Period p = null;
+
+      /* For the moment just build a single BwFreeBusyComponent
+       */
+      BwFreeBusyComponent fbc = null;
+      int lastType = 0;
+
+      it = eventPeriods.iterator();
+      while (it.hasNext()) {
+        EventPeriod ep = (EventPeriod)it.next();
+
+        if (debug) {
+          trace(ep.toString());
+        }
+
+        if (p == null) {
+          p = new Period(ep.getStart(), ep.getEnd());
+          lastType = ep.getType();
+        } else if ((lastType != ep.getType()) || ep.getStart().after(p.getEnd())) {
+          // Non adjacent periods
+          if (fbc == null) {
+            fbc = new BwFreeBusyComponent();
+            fbc.setType(lastType);
+            fb.addTime(fbc);
+          }
+          fbc.addPeriod(p);
+
+          if (lastType != ep.getType()) {
+            fbc = null;
+          }
+
+          p = new Period(ep.getStart(), ep.getEnd());
+          lastType = ep.getType();
+        } else if (ep.getEnd().after(p.getEnd())) {
+          // Extend the current period
+          p = new Period(p.getStart(), ep.getEnd());
+        } // else it falls within the existing period
+      }
+
+      if (p != null) {
+        if ((fbc == null) || (lastType != fbc.getType())) {
+          fbc = new BwFreeBusyComponent();
+          fbc.setType(lastType);
+          fb.addTime(fbc);
+        }
+        fbc.addPeriod(p);
+      }
+    } catch (Throwable t) {
+      if (debug) {
+        error(t);
+      }
+      throw new CalFacadeException(t);
+    }
+
+    return fb;
-  }
-
@@ -1342 +1494 @@
-   * ==================================================================== */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}

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

@@ -1092 +1092 @@
-        // Single leaf calendar - always include
-        sess.setEntity("calendar", calendar);
+        if (debug) {
+          trace("------------Using calendar " + calendar.getPath());
+        }
-      } else {
-        // Non leaf - add entities
@@ -1106 +1109 @@
-        // leaf calendar
-        getSess().setEntity("calendar" + calTerm.i, calendar);
+        if (debug) {
+          trace("------------Using calendar " + calendar.getPath());
+        }
-        calTerm.i++;
-      }

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwEvent.java

@@ -185 +185 @@
-
-  private String link;
+
+  /** Rfc value for a confirmed meeting */
+  public static final String statusConfirmed = "CONFIRMED";
+
+  /** Rfc value for a cancelled meeting */
+  public static final String statusCancelled = "CANCELLED";
+
+  /** Rfc value for a tentative meeting */
+  public static final String statusTentative = "TENTATIVE";
+
-  private String status;
-  private String cost;
@@ -985 +995 @@
-    res.setGuid(getGuid());
-    res.setTransparency(getTransparency());
+    res.setStatus(getStatus());
-
-    return res;

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwFreeBusyComponent.java

@@ -79 +79 @@
-  public static final int typeBusyTentative = 3;
-
-
+ = typeBusy
-
-  /** Collection of Period

trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeException.java

@@ -62 +62 @@
-   * retrieve a localized message and can also be used to identify the
-   * cause of the exception.
- 
+
-   * Every CalFacadeException should have one of these as the getMessage()
-   * value.
-   */
-
+
-  /* ****************** Admin groups ****************************** */
-
+
-  /** The admin group already exists */
-  public static final String duplicateAdminGroup =
-      "org.bedework.exception.duplicateadmingroup";
-
+
-  /** The admin group is already on the path to the root (makes a loop) */
-  public static final String alreadyOnAdminGroupPath =
@@ -78 +78 @@
-
-  /* ****************** Calendars ****************************** */
-
+
-  /** Couldn't find calendar */
-  public static final String calendarNotFound =
@@ -100 +100 @@
-
-  /* ****************** Subscriptions ****************************** */
-
+
-  /** Somebody tried to create a duplicate subscription */
-  public static final String duplicateSubscription =
@@ -109 +109 @@
-      "org.bedework.exception.ical.endandduration";
-
+  /* ****************** Users ****************************** */
+
+  /** No such account */
+  public static final String noSuchAccount =
+      "org.bedework.exception.nosuchaccount";
+
-  /* ****************** Events ****************************** */
-
+
-  /** The guid for this event already exists */
-  public static final String duplicateGuid =
@@ -116 +122 @@
-
-  /* ****************** Timezones ****************************** */
-
+
-  /** Error reading timezones */
-  public static final String timezonesReadError =
-      "org.bedework.error.timezones.readerror";
-
+
-  /** Unknown timezones */
-  public static final String unknownTimezone =
-      "org.bedework.error.unknown.timezone";
-
+
-  /** Bad date */
-  public static final String badDate =
@@ -134 +140 @@
-  public static final String illegalObjectClass =
-      "org.bedework.exception.illegalobjectclass";
-
+
-  private String extra;
-

trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java

@@ -57 +57 @@
-import org.bedework.calfacade.svc.EventInfo;
-
+import net.fortuna.ical4j.model.DateTime;
-import net.fortuna.ical4j.model.Parameter;
-import net.fortuna.ical4j.model.ParameterList;
@@ -671 +672 @@
-    //}
-
+    EntityRange er = new EntityRange();
-    Iterator it = pars.events.iterator();
-    while (it.hasNext()) {
-
-
-
-
-
+
-
-      /* Event is within range if:
@@ -688 +686 @@
-      */
-
-vS
-vE
+r.s
+r.e
-
-      //debugMsg("                   event " + evStart + " to " + evEnd);
-
-      if (((evstSt <= 0) && (evendSt > 0)) ||
-vS
+r.s
-          //((evendSt > 0) && (evEnd.compareTo(end) <= 0))) {
-vE
+r.e
-        // Passed the tests.
-        /*
@@ -704 +702 @@
-                   ": " + ev.getSummary());
-        }*/
-i
+r.entity
-      }
-    }
@@ -731 +729 @@
-    return "0" + String.valueOf(val);
-  }
+
+  private static class EntityRange {
+    Object entity;
+
+    String start;
+    String end;
+
+    void setEntity(Object o) throws CalFacadeException {
+      entity = o;
+
+      if (o instanceof EventInfo) {
+        EventInfo ei = (EventInfo)o;
+        BwEvent ev = ei.getEvent();
+
+        start = ev.getDtstart().getDate();
+        start = ev.getDtend().getDate();
+
+        return;
+      }
+
+      if (o instanceof EventPeriod) {
+        EventPeriod ep = (EventPeriod)o;
+
+        start = String.valueOf(ep.getStart());
+        start = String.valueOf(ep.getEnd());
+
+        return;
+      }
+
+      start = null;
+      end = null;
+    }
+  }
+
+  /**
+   *
+   */
+  public static class EventPeriod implements Comparable {
+    private DateTime start;
+    private DateTime end;
+    private int type;  // from BwFreeBusyComponent
+
+    /** Constructor
+     *
+     * @param start
+     * @param end
+     * @param type
+     */
+    public EventPeriod(DateTime start, DateTime end, int type) {
+      this.start = start;
+      this.end = end;
+      this.type = type;
+    }
+
+    /**
+     * @return DateTime
+     */
+    public DateTime getStart() {
+      return start;
+    }
+
+    /**
+     * @return DateTime
+     */
+    public DateTime getEnd() {
+      return end;
+    }
+
+    /**
+     * @return int
+     */
+    public int getType() {
+      return type;
+    }
+
+    public int compareTo(Object o) {
+      if (!(o instanceof EventPeriod)) {
+        return -1;
+      }
+
+      EventPeriod that = (EventPeriod)o;
+
+      /* Sort by type first */
+      if (type < that.type) {
+        return -1;
+      }
+
+      if (type > that.type) {
+        return 1;
+      }
+
+      int res = start.compareTo(that.start);
+      if (res != 0) {
+        return res;
+      }
+
+      return end.compareTo(that.end);
+    }
+
+    public boolean equals(Object o) {
+      return compareTo(o) == 0;
+    }
+
+    public int hashCode() {
+      return 7 * (type + 1) * (start.hashCode() + 1) * (end.hashCode() + 1);
+    }
+
+    public String toString() {
+      StringBuffer sb = new StringBuffer("EventPeriod{start=");
+
+      sb.append(start);
+      sb.append(", end=");
+      sb.append(end);
+      sb.append(", type=");
+      sb.append(type);
+      sb.append("}");
+
+      return sb.toString();
+    }
+  }
-}
-

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

@@ -55 +55 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-import org.bedework.calfacade.BwUser;
-import org.bedework.calfacade.CalFacadeAccessException;
-
+
+
-import org.bedework.calfacade.CalFacadeException;
+//import org.bedework.calfacade.CalFacadeUtil;
-import org.bedework.calfacade.CalintfDefs;
-
-
-
+
+
+
+
+
-import org.bedework.calfacade.ifs.Calintf;
-
+//
-import org.bedework.calfacade.ifs.Groups;
-
-
+
+
+
-
-import java.sql.Timestamp;
-
-
-
-
+
+
+
+
+
+
+
-
-import org.apache.log4j.Logger;
@@ -92 +104 @@
-* @author Mike Douglass   douglm@rpi.edu
-*/
-
+
+
+
-  protected boolean debug;
-
@@ -110 +124 @@
-  /** Ensure we don't open while open
-   */
-ivate
+otected
-
-  /** Ignore owner for superuser
@@ -125 +139 @@
-   * @see org.bedework.calfacade.Calintf#init(org.bedework.calfacade.BwUser, java.lang.String, boolean, boolean, boolean, java.lang.String, boolean)
-   */
-
+
+
-                      String user,
-                      boolean publicAdmin,
@@ -131 +146 @@
-                      String synchId,
-                      boolean debug) throws CalFacadeException {
+    this.url = url;
-    this.debug = debug;
-    boolean userCreated = false;
@@ -153 +169 @@
-  }
-
+  public boolean getDebug() throws CalFacadeException {
+    return debug;
+  }
+
+  /*
-  public void setSuperUser(boolean val) {
-  }
@@ -160 +181 @@
-  }
-
-  /** Get the current stats
-   *
-   * @return BwStats object
-   * @throws CalFacadeException if not admin
-   */
-  public BwStats getStats() throws CalFacadeException {
-    return null;
@@ -190 +206 @@
-  }
-
-  /** Get the timezones cache object
-   *
-   * @return CalTimezones object
-   * @throws CalFacadeException if not admin
-   */
-  public CalTimezones getTimezones() throws CalFacadeException {
-    return null;
@@ -206 +217 @@
-      );
-  }
-
-
-
-
+
-
-  public void setUser(String val) throws CalFacadeException {
@@ -216 +224 @@
-    user = getUser(val);
-    if (this.user == null) {
-"User " + val + " does not exist."
+CalFacadeException.noSuchAccount, val
-    }
-
@@ -230 +238 @@
-   * ==================================================================== */
-
+  /*
-  public void flushAll() throws CalFacadeException {
-    if (debug) {
@@ -235 +244 @@
-    }
-  }
+  */
-
-  /** Default implementation fails if already open and sets the open flag
@@ -269 +279 @@
-  }
-
+  /*
-  public void beginTransaction() throws CalFacadeException {
-    checkOpen();
@@ -284 +295 @@
-    return null;
-  }
+  */
-
-  /* ====================================================================
@@ -293 +305 @@
-    checkOpen();
-    sess.flush();
-*/
+
-
-  public void refreshEvents() throws CalFacadeException {
@@ -299 +311 @@
-  }
-
-  /*
-  public void lockRead(Object val) throws CalFacadeException {
-    checkOpen();
@@ -315 +326 @@
-   * ==================================================================== */
-
+  /*
-  public long getPublicLastmod() throws CalFacadeException {
-    checkOpen();
@@ -323 +335 @@
-    return "";
-  }
+  */
-
-  /* ====================================================================
@@ -336 +349 @@
-  }
-
+  /*
-  public void updateUser(BwUser user) throws CalFacadeException {
-    checkOpen();
@@ -352 +366 @@
-  }
-
-
-  public BwUser getUser(String account) throws CalFacadeException {
-    checkOpen();
@@ -367 +380 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -372 +386 @@
-   * ==================================================================== */
-
+  /*
-  public void changeAccess(BwShareableDbentity ent,
-                           Collection aces) throws CalFacadeException {
@@ -382 +397 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -387 +403 @@
-   * ==================================================================== */
-
+  /*
-  public void saveTimeZone(String tzid, VTimeZone vtz) throws CalFacadeException {
-    throw new CalFacadeUnimplementedException();
@@ -407 +424 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -412 +430 @@
-   * ==================================================================== */
-
+  /*
-  public BwCalendar getPublicCalendars() throws CalFacadeException {
-    throw new CalFacadeUnimplementedException();
@@ -505 +524 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -510 +530 @@
-   * ==================================================================== */
-
+  /*
-  public void setSearch(String val) throws CalFacadeException {
-    checkOpen();
@@ -520 +541 @@
-  }
-
-
+ 
-  public BwFilter getFilter(String name) throws CalFacadeException {
-    checkOpen();
@@ -547 +568 @@
-
-    return (BwFilter)sess.getUnique();
- */
+
-
-  public void addFilter(BwFilter val) throws CalFacadeException {
@@ -558 +579 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -563 +585 @@
-   * ==================================================================== */
-
+  /*
-  public Collection getCategories(BwUser owner, BwUser creator)
-        throws CalFacadeException {
@@ -605 +628 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -610 +634 @@
-   * ==================================================================== */
-
+  /*
-  public Collection getLocations(BwUser owner, BwUser creator)
-        throws CalFacadeException {
@@ -652 +677 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -657 +683 @@
-   * ==================================================================== */
-
+  /*
-  public Collection getSponsors(BwUser owner, BwUser creator)
-        throws CalFacadeException {
@@ -699 +726 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -704 +732 @@
-   * ==================================================================== */
-
+  /*
-  public CoreEventInfo getEvent(int id) throws CalFacadeException {
-    checkOpen();
@@ -746 +775 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -753 +783 @@
-   * ==================================================================== */
-
+  /*
-  public Collection getEventsByName(BwCalendar cal, String val)
-          throws CalFacadeException {
@@ -758 +789 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -763 +795 @@
-   * ==================================================================== */
-
+  /*
-  public BwSynchInfo getSynchInfo() throws CalFacadeException {
-    checkOpen();
@@ -840 +873 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -845 +879 @@
-   * ==================================================================== */
-
+  /*
-  public Collection getAlarms(BwEvent event, BwUser user) throws CalFacadeException {
-    checkOpen();
@@ -874 +909 @@
-    throw new CalFacadeUnimplementedException();
-  }
+  */
-
-  /* ====================================================================
@@ -894 +930 @@
-  protected Logger getLogger() {
-    if (log == null) {
-this.
+
-    }
-
@@ -904 +940 @@
-  }
-
+  protected void error(Throwable t) {
+    getLogger().error(this, t);
+  }
+
-  protected void trace(String msg) {
+    getLogger().debug(msg);
+  }
+
+  protected void debug(String msg) {
-    getLogger().debug(msg);
-  }

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

@@ -55 +55 @@
-
-import org.bedework.calfacade.BwAlarm;
+import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwCategory;
+import org.bedework.calfacade.BwDateTime;
+import org.bedework.calfacade.BwDuration;
-import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.BwFreeBusy;
-import org.bedework.calfacade.BwLocation;
+import org.bedework.calfacade.BwPrincipal;
-import org.bedework.calfacade.BwSponsor;
-import org.bedework.calfacade.BwStats;
@@ -95 +100 @@
-  /** Must be called to initialise the new object.
-   *
+   * @param url         String url to which we are connecting
-   * @param authenticatedUser    String authenticated user of the application
-   *                             or null for guest
@@ -106 +112 @@
-   * @throws CalFacadeException
-   */
-
+
+
-                      String user,
-                      boolean publicAdmin,
@@ -112 +119 @@
-                      String synchId,
-                      boolean debug) throws CalFacadeException;
+
+  /** Can be called after init to flag the arrival of a user.
+   *
+   * @param val       true for a super user
+   * @throws CalFacadeException
+   */
+  public void logon(BwUser val) throws CalFacadeException;
-
-  /** Called after init to flag this user as a super user.
@@ -692 +706 @@
-   */
-  public Collection getSponsorRefs(BwSponsor val) throws CalFacadeException;
+
+  /* ====================================================================
+   *                   Free busy
+   * ==================================================================== */
+
+  /**
+   * @param cal
+   * @param who
+   * @param start
+   * @param end
+   * @param granularity
+   * @param returnAll
+   * @param ignoreTransparency
+   * @return  BwFreeBusy object representing the calendar (or principals)
+   *          free/busy
+   * @throws CalFacadeException
+   */
+  public BwFreeBusy getFreeBusy(BwCalendar cal, BwPrincipal who,
+                                BwDateTime start, BwDateTime end,
+                                BwDuration granularity,
+                                boolean returnAll,
+                                boolean ignoreTransparency)
+          throws CalFacadeException;
-
-  /* ====================================================================

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

@@ -1038 +1038 @@
-    try {
-      /* Deal with webdav properties */
-
+
+
-        // Not ours
-        super.generatePropValue(node, pr);
@@ -1044 +1045 @@
-      }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if ((cal != null) && (cal.getDescription() != null)) {
-          // XXX lang
@@ -1395 +1445 @@
-      }
-
+      if (uri.endsWith("/")) {
+        uri = uri.substring(0, uri.length() - 1);
+      }
+
-      String[] ss = uri.split("/");
-      int pathLength = ss.length - 1;  // First element is empty string

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

@@ -107 +107 @@
-    // Replace methods
-    methods.put("MKCALENDAR", new MkcalendarMethod());
+    methods.put("OPTIONS", new CalDavOptionsMethod());
-    methods.put("REPORT", new ReportMethod());
-  }

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

@@ -63 +63 @@
-import java.io.StringReader;
-import java.io.Reader;
+import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Vector;
-
-/** Class to represent a caldav node.
@@ -133 +133 @@
-   */
-  public Collection getProperties(String ns) throws WebdavIntfException {
-Vector
+ArrayList
-  }
-

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

@@ -156 +156 @@
-      VFreeBusy vfreeBusy = VFreeUtil.toVFreeBusy(fb);
-      if (vfreeBusy != null) {
-new Calendar
+IcalTranslator.newIcal
-        ical.getComponents().add(vfreeBusy);
-        vfreeBusyString = ical.toString();

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

@@ -58 +58 @@
-
-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;
-
@@ -114 +112 @@
-                            Document doc) throws WebdavException {
-    try {
-      WebdavNsIntf intf = getNsIntf();
-
-      Element root = doc.getDocumentElement();
-
@@ -134 +130 @@
-        Iterator pit = sr.iterator();
-        while (pit.hasNext()) {
-
+
+
+
+
+
-        }
-      }

trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/calquery/FreeBusyQuery.java

@@ -137 +137 @@
-        throw WebdavIntfException.unauthorized();
-      }
-
+
+
+
+
+
+
-                                       timeRange.getStart(), timeRange.getEnd(),
-                                       null, false);

trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/common/OptionsMethod.java

@@ -52 +52 @@
-    to the maximum extent the law permits.
-*/
-
-package edu.rpi.cct.webdav.servlet.common;
-
@@ -91 +90 @@
-      }
-
-
-
-
-
-
+
-
-      // Lisa say's we need this
@@ -119 +114 @@
-    }
-  }
+
+  protected void addDavHeader(HttpServletResponse resp) throws WebdavException {
+    if (getNsIntf().getAccessControl()) {
+      resp.addHeader("DAV", "1, 2, 3, access-control");
+    } else {
+      resp.addHeader("DAV", "1, 2, 3");
+    }
+  }
-}
-

trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/common/PropPatchMethod.java

@@ -156 +156 @@
-      Element prop = props[i];
-
-      String ns = prop.getNamespaceURI();
-      String nm = prop.getLocalName();
-      String value = getElementContent(prop);
-
@@ -164 +162 @@
-      }
-
-new Property(ns, nm, value)
+prop
-
-      if (debug) {
-
+
+
+
-      }
-    }

trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/CalintfCaldavImpl.java

@@ -59 +59 @@
-import org.bedework.calfacade.BwCategory;
-import org.bedework.calfacade.BwDateTime;
+import org.bedework.calfacade.BwDuration;
-import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.BwFreeBusy;
-import org.bedework.calfacade.BwLocation;
+import org.bedework.calfacade.BwPrincipal;
-import org.bedework.calfacade.BwSponsor;
-import org.bedework.calfacade.BwStats;
+import org.bedework.calfacade.BwSystem;
-import org.bedework.calfacade.CoreEventInfo;
-//import org.bedework.calfacade.BwSynchData;
@@ -110 +114 @@
-   * @see org.bedework.calfacade.Calintf#init(org.bedework.calfacade.BwUser, java.lang.String, boolean, boolean, boolean, java.lang.String, boolean)
-   */
-
+
+
-                      String user,
-                      boolean publicAdmin,
@@ -116 +121 @@
-                      String synchId,
-                      boolean debug) throws CalFacadeException {
-
+url, 
-                                   groups, synchId, debug);
-
@@ -130 +135 @@
-  }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  public BwStats getStats() throws CalFacadeException {
-    return null;
-  }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  public CalTimezones getTimezones() throws CalFacadeException {
-    return null;
@@ -150 +178 @@
-  public CalintfInfo getInfo() throws CalFacadeException {
-    return info;
-  }
-
-  public boolean getDebug() throws CalFacadeException {
-    return debug;
-  }
-
@@ -181 +205 @@
-  }
-
-  public synchronized void open() throws CalFacadeException {
-    super.open();
-  }
-
-  public synchronized void close() throws CalFacadeException {
-    super.close();
-  }
-
-  public void beginTransaction() throws CalFacadeException {
-    checkOpen();
@@ -209 +225 @@
-   * ==================================================================== */
-
-  /*
-  public void refresh() throws CalFacadeException {
-    checkOpen();
-    sess.flush();
-  }*/
-
-  public void refreshEvents() throws CalFacadeException {
-    checkOpen();
-  }
-
-  /*
-  public void lockRead(Object val) throws CalFacadeException {
-    checkOpen();
-    sess.lockRead(val);
-  }
-
-  public void lockMod(Object val) throws CalFacadeException {
-    checkOpen();
-    sess.lockUpdate(val);
-  }
-  */
-
-  /* ====================================================================
@@ -248 +246 @@
-   * ==================================================================== */
-
-
-
+
+
+
+
+
+
+
+
+
-  }
-
@@ -257 +262 @@
-  }
-
-
-  public BwUser getUser(String user) throws CalFacadeException {
-    checkOpen();
@@ -263 +267 @@
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    checkOpen();
-    throw new CalFacadeUnimplementedException();
@@ -345 +328 @@
-
-  public BwCalendar getCalendars() throws CalFacadeException {
+    throw new CalFacadeUnimplementedException();
+  }
+
+  public BwCalendar getCalendars(BwUser user,
+                                 int desiredAccess) throws CalFacadeException {
-    throw new CalFacadeUnimplementedException();
-  }
@@ -389 +377 @@
-  }
-
+  public BwCalendar getSpecialCalendar(BwUser user,
+                                       int calType,
+                                       boolean create) throws CalFacadeException {
+    throw new CalFacadeUnimplementedException();
+  }
+
-  public void addCalendar(BwCalendar val, String parentPath) throws CalFacadeException {
-    checkOpen();
@@ -396 +390 @@
-
-  public void updateCalendar(BwCalendar val) throws CalFacadeException {
+    checkOpen();
+    throw new CalFacadeUnimplementedException();
+  }
+
+  public void changeAccess(BwCalendar cal,
+                           Collection aces) throws CalFacadeException {
-    checkOpen();
-    throw new CalFacadeUnimplementedException();
@@ -573 +573 @@
-    checkOpen();
-
+    throw new CalFacadeUnimplementedException();
+  }
+
+  /* ====================================================================
+   *                   Free busy
+   * ==================================================================== */
+
+  public BwFreeBusy getFreeBusy(BwCalendar cal, BwPrincipal who,
+                                BwDateTime start, BwDateTime end,
+                                BwDuration granularity,
+                                boolean returnAll,
+                                boolean ignoreTransparency)
+          throws CalFacadeException {
-    throw new CalFacadeUnimplementedException();
-  }
@@ -615 +628 @@
-  }
-
+  public Collection getDeletedProxies() throws CalFacadeException {
+    throw new CalFacadeUnimplementedException();
+  }
+
+  public Collection getDeletedProxies(BwCalendar cal) throws CalFacadeException {
+    throw new CalFacadeUnimplementedException();
+  }
+
-  /* ====================================================================
-   *                       Caldav support
@@ -742 +763 @@
-    throw new CalFacadeUnimplementedException();
-  }
+
+  /* ====================================================================
+   *                   Free busy
+   * ==================================================================== */
-}
-

trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java

@@ -57 +57 @@
-import org.bedework.calfacade.CalFacadeException;
-import org.bedework.http.client.caldav.CaldavClient;
+import org.bedework.http.client.DepthHttpMethod;
-import org.bedework.http.client.HttpManager;
-
@@ -135 +136 @@
-   * @param url
-   * @param hdrs
+   * @param depth
-   * @param contentType
-   * @param contentLen
@@ -142 +144 @@
-   */
-  public int sendRequest(String method, String url,
-
+
+
-                         byte[] content) throws Throwable {
-
+
+
-  }
-
@@ -154 +158 @@
-   * @param pw
-   * @param hdrs
+   * @param depth
-   * @param contentType
-   * @param contentLen
@@ -161 +166 @@
-   */
-  public int sendRequest(String method, String url, String user, String pw,
-
+
+
-                         byte[] content) throws Throwable {
-    int sz = 0;
@@ -175 +181 @@
-
-    HttpMethod meth = client.getMethod();
+
+    if (meth instanceof DepthHttpMethod) {
+      ((DepthHttpMethod)meth).setDepth(depth);
+    }
-
-    if (user != null) {

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

@@ -730 +730 @@
-  }
-
+  public boolean isUserRoot(BwCalendar cal) throws CalFacadeException {
+    if (cal == null) {
+      return false;
+    }
+
+    String[] ss = cal.getPath().split("/");
+    int pathLength = ss.length - 1;  // First element is empty string
+
+    return (pathLength == 2) &&
+           (ss[1].equals(getSyspars().getUserCalendarRoot()));
+  }
+
-  /* ====================================================================
-   *                   Views
@@ -1022 +1034 @@
-   * ==================================================================== */
-
-
+
+
-                                BwDateTime start, BwDateTime end,
-                                BwDuration granularity,
@@ -1032 +1045 @@
-
-    BwUser u = (BwUser)who;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-      getCal().checkAccess(cal, PrivilegeDefs.privReadFreeBusy, false);
-
@@ -1092 +1094 @@
-        if (!sub.getIgnoreTransparency() &&
-            BwEvent.transparencyTransparent.equals(ev.getTransparency())) {
+          // Ignore this one.
+          continue;
+        }
+
+        if (BwEvent.statusCancelled.equals(ev.getStatus())) {
-          // Ignore this one.
-          continue;
@@ -1148 +1155 @@
-            }
-          } else if (periodEvents.size() != 0) {
-
+
+
+
+
-
-            DateTime psdt = new DateTime(gpp.startDt.getDtval());
@@ -1155 +1165 @@
-            psdt.setUtc(true);
-            pedt.setUtc(true);
+
+            if (fbc == null) {
+              fbc = new BwFreeBusyComponent();
+              fb.addTime(fbc);
+            }
+
-            fbc.addPeriod(new Period(psdt, pedt));
-          }
@@ -1169 +1185 @@
-        EventInfo ei = (EventInfo)it.next();
-        BwEvent ev = ei.getEvent();
+
+        if (BwEvent.statusCancelled.equals(ev.getStatus())) {
+          // Ignore this one.
+          continue;
+        }
-
-        // Ignore if times were specified and this event is outside the times
@@ -1198 +1219 @@
-        pedt.setUtc(true);
-
-
+
+
+
+
+
+
+
-      }
-
@@ -1209 +1236 @@
-       */
-      BwFreeBusyComponent fbc = null;
+      int lastType = 0;
-
-      it = eventPeriods.iterator();
@@ -1214 +1242 @@
-        EventPeriod ep = (EventPeriod)it.next();
-
+        if (debug) {
+          trace(ep.toString());
+        }
+
-        if (p == null) {
-          p = new Period(ep.start, ep.end);
-
+
+
-          // Non adjacent periods
-          if (fbc == null) {
-            fbc = new BwFreeBusyComponent();
+            fbc.setType(lastType);
+            fb.addTime(fbc);
-          }
-          fbc.addPeriod(p);
+
+          if (lastType != ep.type) {
+            fbc = null;
+          }
+
-          p = new Period(ep.start, ep.end);
+          lastType = ep.type;
-        } else if (ep.end.after(p.getEnd())) {
-          // Extend the current period
@@ -1230 +1271 @@
-
-      if (p != null) {
-fbc == null
+(fbc == null) || (lastType != fbc.getType())
-          fbc = new BwFreeBusyComponent();
+          fbc.setType(lastType);
+          fb.addTime(fbc);
-        }
-        fbc.addPeriod(p);
-      }
-
-      if (fbc != null) {
-        fb.addTime(fbc);
-      }
-    } catch (Throwable t) {
+      if (debug) {
+        error(t);
+      }
-      throw new CalFacadeException(t);
-    }
@@ -1249 +1291 @@
-    DateTime start;
-    DateTime end;
-
-
+
+
+
-      this.start = start;
-      this.end = end;
+      this.type = type;
-    }
-
@@ -1262 +1306 @@
-      EventPeriod that = (EventPeriod)o;
-
+      /* Sort by type first */
+      if (type < that.type) {
+        return -1;
+      }
+
+      if (type > that.type) {
+        return 1;
+      }
+
-      int res = start.compareTo(that.start);
-      if (res != 0) {
@@ -1268 +1321 @@
-
-      return end.compareTo(that.end);
+    }
+
+    public boolean equals(Object o) {
+      return compareTo(o) == 0;
+    }
+
+    public int hashCode() {
+      return 7 * (type + 1) * (start.hashCode() + 1) * (end.hashCode() + 1);
+    }
+
+    public String toString() {
+      StringBuffer sb = new StringBuffer("EventPeriod{start=");
+
+      sb.append(start);
+      sb.append(", end=");
+      sb.append(end);
+      sb.append(", type=");
+      sb.append(type);
+      sb.append("}");
+
+      return sb.toString();
-    }
-  }
@@ -1921 +1995 @@
-      // Explicitly selected calendar - via a subscription.
-
-).getEvents(sub.getCalendar(), filter, startDate
-endDate, recurRetrieval
-
+sub).getEvents(sub.getCalendar(), filter
+   startDate, endDate
+   recurRetrieval, 
-                         sub);
-    }
@@ -2212 +2286 @@
-  }*/
-
+  /* This will get a calintf based on the subscription uri.
+   */
+  Calintf getCal(BwSubscription sub) throws CalFacadeException {
+    return getCal();
+  }
+
+  /* Currently this gets a local calintf only. Later we need to use a par to
+   * get calintf from a table.
+   */
-  Calintf getCal() throws CalFacadeException {
-    if (cali != null) {
@@ -2227 +2310 @@
-      cali.beginTransaction();
-
-
+
+
-                                      pars.getUser(),
-                                      pars.getPublicAdmin(),
@@ -2549 +2633 @@
-    getLogger().debug(msg);
-  }
+
+  private void error(Throwable t) {
+    getLogger().error(this, t);
+  }
-}
-

trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java

@@ -612 +612 @@
-  public abstract int deleteCalendar(BwCalendar val) throws CalFacadeException;
-
+  /** Return true if cal != null and it represents a (local) user root
+   *
+   * @param cal
+   * @return boolean
+   * @throws CalFacadeException
+   */
+  public abstract boolean isUserRoot(BwCalendar cal) throws CalFacadeException;
+
-  /* ====================================================================
-   *                   Views
@@ -812 +820 @@
-   * events fall in the segment.
-   *
-
+
+
-   *               for default collection (as specified by user).
-
+
+
+
-   * @param start
-   * @param end
@@ -825 +836 @@
-   * @throws CalFacadeException
-   */
-
+
+
-                                         BwDateTime start, BwDateTime end,
-                                         BwDuration granularity,

trunk/calendar3/freebusyServer/src/org/bedework/freebusyServer/FreeBusyAggregator.java

@@ -134 +134 @@
-//    req.addContentLine("                end=\"" +
-//                               CalFacadeUtil.isoDateTimeUTC(end) + "\"/>");
-52
-528
+60
+631
-    req.addContentLine("</C:free-busy-query>");
-
@@ -158 +158 @@
-                         "/ucaldav/user/johnsa"));
-                         */
-
+
-    addUser(new UserInfo("testuser02", "bedework", "testuser02",
-                         "www.bedework.org", 80, false,
-                         "/ucaldav/user/testuser02"));
-
+
+
+
+
+
+
-                         "www.bedework.org", 80, false,
-
-
+
+
+
+
+
-    getSvci(); //
-  }
@@ -185 +193 @@
-      if (r.getAuth()) {
-        resp.responseCode = cio.sendRequest(r.getMethod(), r.getUrl(),
-
+
+
-                                            r.getContentType(),
-                                            r.getContentLength(), r.getContentBytes());
-      } else {
-
+
+
-                                            r.getContentType(), r.getContentLength(),
-                                            r.getContentBytes());

trunk/calendar3/test/caldavTestData/eg/content/eg02.xml

@@ -30 +30 @@
-    <C:comp-filter name="VCALENDAR">
-      <C:comp-filter name="VEVENT">
-50402
-50602
+60601
+60630
-      </C:comp-filter>
-    </C:comp-filter>

trunk/calendar3/test/caldavTestData/eg/content/eg20.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:free-busy-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-
-
+
+
+
+
-</C:free-busy-query>
-

trunk/calendar3/test/caldavTestData/eg/eg12.test

@@ -14 +14 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:free-busy-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-507
-5
+604
+6
-</C:free-busy-query>
-

trunk/calendar3/test/caldavTestData/eg/eg16.test

@@ -5 +5 @@
-AUTH: true
-
-newcol
+RPI_TEST
-

trunk/calendar3/test/caldavTestData/eg/eg17.test

@@ -5 +5 @@
-AUTH: true
-
-newcol/newcalendar
+RPI_TEST/RPI_TEST/
-

trunk/calendar3/test/src/org/bedework/tests/caldav/Req.java

@@ -74 +74 @@
-  String description;
-  Header[] hdrs;
+  int depth;
-  String contentType;
-  String[] content;
@@ -89 +90 @@
-  static final String exprespHdr = "EXPECT-RESPONSE: ";
-  static final String methHdr = "METHOD: ";
+  static final String depthHdr = "DEPTH: ";
-  static final String authHdr = "AUTH: ";
-  static final String urlHdr = "URL: ";
@@ -141 +143 @@
-           */
-          method = ln.substring(methHdr.length());
+        } else if (ln.startsWith(depthHdr)) {
+          /*
+                DEPTH
+           */
+          depth = Integer.valueOf(ln.substring(depthHdr.length())).intValue();
-        } else if (ln.startsWith(authHdr)) {
-          /*
@@ -262 +269 @@
-
-  /**
+   * @return int
+   */
+  public int getDepth() {
+    return depth;
+  }
+
+  /**
-   * @return String
-   */

trunk/calendar3/test/src/org/bedework/tests/caldav/TestCalDav.java

@@ -365 +365 @@
-      if (r.getAuth()) {
-        respCode = cio.sendRequest(r.getMethod(), r.getPrefixedUrl(),
-
+
+
-                                   r.getContentLength(), r.getContentBytes());
-      } else {
-
+
+
-                                   r.getContentType(), r.getContentLength(),
-                                   r.getContentBytes());

trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java

@@ -78 +78 @@
- * <p>Request parameters - all optional:<ul>
- *      <li>  userid:   whose free busy we want - default to current user</li>.
-calendar: name of the calendar
+subname:  name of the subscription
- *                      specified by user</li>.
- *      <li>  start:    start of period - default to beginning of this week</li>.
@@ -203 +203 @@
-
-      try {
-
+null, 
-                                         CalFacadeUtil.getDateTime(sdt, false, false, tzs),
-                                         CalFacadeUtil.getDateTime(edt, false, false, tzs),