Changeset 418

Timestamp:

04/27/06 23:57:39

Author:

douglm

Message:

Add caldav properties and process them

Files:

• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwSystem.java (modified) (3 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java (modified) (9 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavURI.java (modified) (1 diff)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/ReportMethod.java (modified) (1 diff)
• trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/common/MethodBase.java (modified) (2 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/common/PropFindMethod.java (modified) (9 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsIntf.java (modified) (4 diffs)
• trunk/calendar3/common/src/edu/rpi/sss/util/xml/XmlEmit.java (modified) (2 diffs)
• trunk/calendar3/davdefs/src/org/bedework/davdefs/CaldavTags.java (modified) (3 diffs)
• trunk/calendar3/icalendar/src/org/bedework/icalendar/IcalTranslator.java (modified) (13 diffs)
• trunk/calendar3/test/caldavTestData/eg/eg15.test (modified) (1 diff)
• trunk/calendar3/test/src/org/bedework/tests/caldav/TestCalDav.java (modified) (3 diffs)

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

@@ -299 +299 @@
-    if (cal != null) {
-      // Need to clone for this
-cal.setCurrentAccess(access.checkAccess(cal, privRead, false)
-access.checkAccess
+access.checkAccess(cal, desiredAccess, false
+cal = cloneAndCheckOne
-    }
-

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

@@ -61 +61 @@
-/** System settings for an instance of bedework as represented by a single
- * database. These settings may be changed by the super user but most should
-.
+
- *
- * @author Mike Douglass       douglm@rpi.edu
@@ -96 +96 @@
-  private long defaultUserQuota = 1000000 * 10; // 10 Meg OK?
-
+  private int maxInstances;
+
-  private String userauthClass;
-  private String mailerClass;
@@ -387 +389 @@
-  public long getDefaultUserQuota() {
-    return defaultUserQuota;
+  }
+
+  /** Set the max instances per recurring event.
+   *
+   * @param val    int max
+   */
+  public void setMaxInstances(int val) {
+    maxInstances = val;
+  }
+
+  /**
+   *
+   * @return int
+   */
+  public int getMaxInstances() {
+    return maxInstances;
-  }
-

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

@@ -85 +85 @@
-import edu.rpi.cct.webdav.servlet.shared.WebdavNsNode;
-import edu.rpi.cct.webdav.servlet.shared.WebdavProperty;
+import edu.rpi.sss.util.xml.QName;
+
+import net.fortuna.ical4j.model.TimeZone;
-
-import java.io.IOException;
@@ -100 +103 @@
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
@@ -124 +128 @@
-   */
-  private String namespacePrefix;
-
+
-  private EmitAccess emitAccess;
-
@@ -172 +176 @@
-                   boolean debug) throws WebdavIntfException {
-    super.init(servlet, req, props, debug);
-
+
-    try {
-      HttpSession session = req.getSession();
-      ServletContext sc = session.getServletContext();
-
+
-      String appName = sc.getInitParameter("bwappname");
-
+
-      if ((appName == null) || (appName.length() == 0)) {
-        appName = "unknown-app-name";
-      }
-
+
-      envPrefix = "org.bedework.app." + appName + ".";
-
+
-      namespacePrefix = WebdavUtils.getUrlPrefix(req);
-      namespace = namespacePrefix + "/schema";
@@ -190 +194 @@
-      publicCalendarRoot = getSvci().getSyspars().getPublicCalendarRoot();
-      userCalendarRoot = getSvci().getSyspars().getUserCalendarRoot();
-
+
-      emitAccess = new EmitAccess(namespacePrefix, xml);
-    } catch (Throwable t) {
@@ -790 +794 @@
-    }
-
- 
+
-                          Privileges.makePriv(priv)));
-  }
@@ -837 +841 @@
-    }
-  }
-
+
-  public void emitSupportedPrivSet(WebdavNsNode node) throws WebdavIntfException {
-    try {
@@ -1012 +1016 @@
-   * ==================================================================== */
-
+  /** Generate a response for a single webdav property. This should be overrriden
+   * to handle other namespaces.
+   *
+   * @param node
+   * @param pr
+   * @throws WebdavIntfException
+   */
+  public void generatePropValue(WebdavNsNode node,
+                                WebdavProperty pr) throws WebdavIntfException {
+    QName tag = pr.getTag();
+    String ns = tag.getNamespaceURI();
+    boolean isCalendar = node instanceof CaldavCalNode;
+    CaldavCalNode calNode = null;
+    BwCalendar cal = null;
+
+    if (isCalendar) {
+      calNode = (CaldavCalNode)node;
+      cal = calNode.getCDURI().getCal();
+    }
+
+    try {
+      /* Deal with webdav properties */
+      if (!ns.equals(CaldavDefs.caldavNamespace)) {
+        // Not ours
+        super.generatePropValue(node, pr);
+        return;
+      }
+
+      if (tag.equals(CaldavTags.calendarDescription)) {
+        if ((cal != null) && (cal.getDescription() != null)) {
+          // XXX lang
+          openPropstat();
+          xml.property(tag, cal.getDescription());
+          closePropstat();
+        }
+      } else if (tag.equals(CaldavTags.calendarTimezone)) {
+        TimeZone tz = getSvci().getTimezones().getDefaultTimeZone();
+        openPropstat();
+        xml.property(tag, trans.toStringTzCalendar(tz.getID()));
+        closePropstat();
+      } else if (tag.equals(CaldavTags.supportedCalendarComponentSet)) {
+        /* e.g.
+         *          <C:supported-calendar-component-set
+         *                 xmlns:C="urn:ietf:params:xml:ns:caldav">
+         *            <C:comp name="VEVENT"/>
+         *            <C:comp name="VTODO"/>
+         *         </C:supported-calendar-component-set>
+         */
+        openPropstat();
+        xml.openTag(tag);
+        xml.startTag(CaldavTags.comp);
+        xml.atribute("name", "VEVENT");
+        xml.closeTag(tag);
+        closePropstat();
+      } else if (tag.equals(CaldavTags.supportedCalendarData)) {
+        /* e.g.
+         * <C:supported-calendar-data
+         *              xmlns:C="urn:ietf:params:xml:ns:caldav">
+         *   <C:calendar-data content-type="text/calendar" version="2.0"/>
+         * </C:supported-calendar-data>
+         */
+        openPropstat();
+        xml.openTag(tag);
+        xml.startTag(CaldavTags.calendarData);
+        xml.atribute("content-type", "text/calendar");
+        xml.atribute("version", "2.0");
+        xml.closeTag(tag);
+        closePropstat();
+      } else if (tag.equals(CaldavTags.maxAttendeesPerInstance)) {
+      } else if (tag.equals(CaldavTags.maxDateTime)) {
+      } else if (tag.equals(CaldavTags.maxInstances)) {
+      } else if (tag.equals(CaldavTags.maxResourceSize)) {
+        /* e.g.
+         * <C:max-resource-size
+         *    xmlns:C="urn:ietf:params:xml:ns:caldav">102400</C:max-resource-size>
+         */
+        openPropstat();
+        xml.property(tag, String.valueOf(getSvci().getSyspars().getMaxUserEntitySize()));
+        closePropstat();
+      } else if (tag.equals(CaldavTags.minDateTime)) {
+      } else {
+        // Not known
+        openPropstat();
+        xml.emptyTag(tag);
+        closePropstat(HttpServletResponse.SC_NOT_FOUND);
+      }
+    } catch (WebdavIntfException wie) {
+      throw wie;
+    } catch (Throwable t) {
+      throw new WebdavIntfException(t);
+    }
+  }
+
-  public void generatePropResourcetype(WebdavNsNode node)
-          throws WebdavIntfException {
@@ -1192 +1289 @@
-       * user, if non-null, is the user calendar we want to access.
-       */
- 
+
-                                         account,
-                                         envPrefix,

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

@@ -76 +76 @@
-
-  String entityName;
-
-  CaldavURI(boolean ispublic, BwCalendar cal) {
-    init(ispublic, cal, null);
-  }
-
-  CaldavURI(boolean ispublic, BwCalendar cal, String entityName) {

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

@@ -455 +455 @@
-
-    if (status != HttpServletResponse.SC_OK) {
-
+
+
+
+
+
+
-    } else if (reportType == reportTypeExpandProperty) {
-    } else {
-, status
+
-
-      /* Output the (transformed) node.

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

@@ -110 +110 @@
-  public abstract void init();
-
- 
+
-      new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss ");
-
@@ -482 +482 @@
-  protected String getEntityTag(WebdavNsNode node, boolean strong)
-      throws WebdavException {
-
-
-
-
-
-
-
+
-  }
-

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

@@ -58 +58 @@
-
-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 edu.rpi.cct.webdav.servlet.shared.WebdavProperty;
@@ -68 +69 @@
-
-import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@@ -95 +97 @@
-    /** For the prop element we build a Collection of WebdavProperty
-     */
-Vector
+Collection
-  }
-
@@ -205 +207 @@
-  public PropRequest parseProps(Node nd) throws WebdavException {
-    PropRequest pr = new PropRequest(PropRequest.reqProp);
-Vector
+ArrayList
-
-    Element[] children = getChildren(nd);
@@ -222 +224 @@
-      addNs(prop.getTag().getNamespaceURI());
-
-Element
+
-    }
-
@@ -258 +260 @@
-  }
-
-
+
+
-   * @param node
-   * @param pr
-   * @param status
-   * @throws WebdavException
-   */
-  public void doNodeProperties(WebdavNsNode node,
-
-
+
-    addHref(node);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  }
-
@@ -305 +286 @@
-    openTag(WebdavTags.response);
-
-, HttpServletResponse.SC_OK
+
-
-    closeTag(WebdavTags.response);
@@ -328 +309 @@
-  /* Build the response for a single node for a propfind request
-   */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -442 +369 @@
-  private void doNodeNsProperties(WebdavNsNode node) throws WebdavException {
-    Enumeration en = getNsIntf().getProperties(node);
+    WebdavNsIntf intf = getNsIntf();
-
-    while (en.hasMoreElements()) {
-      WebdavProperty prop = (WebdavProperty)en.nextElement();
-
-property(prop.getTag(), prop.getPval()
+intf.generatePropValue(node, prop
-    }
-  }

trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsIntf.java

@@ -57 +57 @@
-import org.bedework.davdefs.WebdavTags;
-
+import edu.rpi.sss.util.xml.QName;
-import edu.rpi.sss.util.xml.XmlEmit;
-import edu.rpi.sss.util.xml.XmlUtil;
@@ -70 +71 @@
-import java.util.Properties;
-import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
@@ -549 +551 @@
-   * ==================================================================== */
-
+  /** Open a propstat response.
+   *
+   * @throws WebdavIntfException
+   */
+  public void openPropstat() throws WebdavIntfException {
+    try {
+      xml.openTag(WebdavTags.propstat);
+      xml.openTag(WebdavTags.prop);
+    } catch (Throwable t) {
+      throw new WebdavIntfException(t);
+    }
+  }
+
+  /** Close a propstat response with given result.
+   *
+   * @param status
+   * @throws WebdavIntfException
+   */
+  public void closePropstat(int status) throws WebdavIntfException {
+    try {
+      xml.closeTag(WebdavTags.prop);
+
+      if ((status != HttpServletResponse.SC_OK) ||
+          getReturnMultistatusOk()) {
+        xml.property(WebdavTags.status, "HTTP/1.1 " + status + " " +
+                     WebdavStatusCode.getMessage(status));
+      }
+
+      xml.closeTag(WebdavTags.propstat);
+    } catch (Throwable t) {
+      throw new WebdavIntfException(t);
+    }
+  }
+
+  /** Close a propstat response with an ok result.
+   *
+   * @throws WebdavIntfException
+   */
+  public void closePropstat() throws WebdavIntfException {
+    closePropstat(HttpServletResponse.SC_OK);
+  }
+
+  /** Generate a response for a single webdav property. This should be overrriden
+   * to handle other namespaces.
+   *
+   * @param node
+   * @param pr
+   * @throws WebdavIntfException
+   */
+  public void generatePropValue(WebdavNsNode node,
+                                WebdavProperty pr) throws WebdavIntfException {
+    QName tag = pr.getTag();
+    String ns = tag.getNamespaceURI();
+
+    try {
+      /* Deal with webdav properties */
+      if (!ns.equals(WebdavTags.namespace)) {
+        // Not ours
+        openPropstat();
+        xml.emptyTag(tag);
+        closePropstat(HttpServletResponse.SC_NOT_FOUND);
+      }
+
+      if (tag.equals(WebdavTags.creationdate)) {
+        // dav 13.1
+        if (node.getCreDate() != null) {
+          openPropstat();
+          xml.property(tag, node.getCreDate());
+          closePropstat();
+        }
+      } else if (tag.equals(WebdavTags.displayname)) {
+        // dav 13.2
+        openPropstat();
+        xml.property(tag, node.getName());
+        closePropstat();
+      } else if (tag.equals(WebdavTags.getcontentlanguage)) {
+        // dav 13.3
+      } else if (tag.equals(WebdavTags.getcontentlength)) {
+        // dav 13.4
+      } else if (tag.equals(WebdavTags.getcontenttype)) {
+        // dav 13.5
+        openPropstat();
+        generatePropContenttype(node);
+        closePropstat();
+      } else if (tag.equals(WebdavTags.getetag)) {
+        // dav 13.6
+        openPropstat();
+        xml.property(tag, getEntityTag(node, true));
+        closePropstat();
+      } else if (tag.equals(WebdavTags.getlastmodified)) {
+        // dav 13.7
+        if (node.getLastmodDate() != null) {
+          openPropstat();
+          xml.property(tag, node.getLastmodDate());
+          closePropstat();
+        }
+      } else if (tag.equals(WebdavTags.lockdiscovery)) {
+        // dav 13.8
+      } else if (tag.equals(WebdavTags.resourcetype)) {
+        // dav 13.9
+        openPropstat();
+        generatePropResourcetype(node);
+        closePropstat();
+      } else if (tag.equals(WebdavTags.source)) {
+        // dav 13.10
+      } else if (tag.equals(WebdavTags.supportedlock)) {
+        // dav 13.11
+      } else if (tag.equals(WebdavTags.owner)) {
+        // access 5.1
+        openPropstat();
+        xml.openTag(tag);
+        xml.property(WebdavTags.href, makeUserHref(node.getOwner()));
+        xml.closeTag(tag);
+        closePropstat();
+      } else if (tag.equals(WebdavTags.supportedPrivilegeSet)) {
+        // access 5.2
+        openPropstat();
+        emitSupportedPrivSet(node);
+        closePropstat();
+      } else if (tag.equals(WebdavTags.currentUserPrivilegeSet)) {
+        // access 5.3
+      } else if (tag.equals(WebdavTags.acl)) {
+        // access 5.4
+        openPropstat();
+        emitAcl(node);
+        closePropstat();
+      } else if (tag.equals(WebdavTags.aclRestrictions)) {
+        // access 5.5
+      } else if (tag.equals(WebdavTags.inheritedAclSet)) {
+        // access 5.6
+      } else if (tag.equals(WebdavTags.principalCollectionSet)) {
+        // access 5.7
+      } else {
+        // Not known
+        openPropstat();
+        xml.emptyTag(tag);
+        closePropstat(HttpServletResponse.SC_NOT_FOUND);
+      }
+    } catch (WebdavIntfException wie) {
+      throw wie;
+    } catch (Throwable t) {
+      throw new WebdavIntfException(t);
+    }
+  }
+
-  /** Generate content type.
-   *
@@ -583 +730 @@
-  }
-
+  /** Entity tags are defined in RFC2068 - they are supposed to provide some
+   * sort of indication the data has changed - e.g. a checksum.
+   * <p>There are weak and strong tags
+   *
+   * @param node
+   * @param strong
+   * @return String tag
+   * @throws WebdavException
+   */
+  public String getEntityTag(WebdavNsNode node, boolean strong)
+      throws WebdavException {
+    String val = getEtagValue(node, strong);
+
+    if (strong) {
+      return "\"" + val + "\"";
+    }
+
+    return "W/\"" + val + "\"";
+  }
+
-  /* ====================================================================
-   *                   XmlUtil wrappers

trunk/calendar3/common/src/edu/rpi/sss/util/xml/XmlEmit.java

@@ -208 +208 @@
-  }
-
+  /** Start tag ready for attributes
+   *
+   * @param tag
+   * @throws IOException
+   */
+  public void startTag(QName tag) throws IOException {
+    blanks();
+    startTagSameLine(tag);
+  }
+
+  /** Add an attribute
+   *
+   * @param attrName
+   * @param attrVal
+   * @throws IOException
+   */
+  public void atribute(String attrName, String attrVal) throws IOException {
+    wtr.write(" ");
+    wtr.write(attrName);
+    wtr.write("=");
+    quote(attrVal);
+  }
+
+  /** End an empty tag
+   *
+   * @throws IOException
+   */
+  public void endEmptyTag() throws IOException {
+    wtr.write(" /");
+    rb();
+  }
+
-  /**
-   * @param tag
@@ -217 +249 @@
-    wtr.write("/");
-    rb();
+  }
+
+  /**
+   * @param tag
+   * @throws IOException
+   */
+  public void startTagSameLine(QName tag) throws IOException {
+    lb();
+    tagname(tag);
+  }
+
+  private void quote(String val) throws IOException {
+    if (val.indexOf("\"") < 0) {
+      wtr.write("\"");
+      wtr.write(val);
+      wtr.write("\"");
+    } else {
+      wtr.write("'");
+      wtr.write(val);
+      wtr.write("'");
+    }
-  }
-

trunk/calendar3/davdefs/src/org/bedework/davdefs/CaldavTags.java

@@ -83 +83 @@
-
-  /**   */
+  public static final QName calendarTimezone = new QName(caldavNamespace,
+                                                         "calendar-timezone");
+
+  /**   */
-  public static final QName calendarMultiget = new QName(caldavNamespace,
-                                                         "calendar-multiget");
@@ -127 +131 @@
-
-  /**   */
+  public static final QName maxAttendeesPerInstance = new QName(caldavNamespace,
+                                                    "max-attendees-per-instance");
+
+  /**   */
+  public static final QName maxDateTime = new QName(caldavNamespace,
+                                                    "max-date-time");
+
+  /**   */
+  public static final QName maxInstances = new QName(caldavNamespace,
+                                                     "max-instances");
+
+  /**   */
+  public static final QName maxResourceSize = new QName(caldavNamespace,
+                                                        "max-resource-size");
+
+  /**   */
+  public static final QName minDateTime = new QName(caldavNamespace,
+                                                    "min-date-time");
+
+  /**   */
-  public static final QName paramFilter = new QName(caldavNamespace,
-                                                    "param-filter");
@@ -147 +171 @@
-
-  /**   */
+  public static final QName supportedCalendarComponentSet = new QName(caldavNamespace,
+                                            "supported-calendar-component-set");
+
+  /**   */
+  public static final QName supportedCalendarData = new QName(caldavNamespace,
+                                                      "supported-calendar-data");
+
+  /**   */
-  public static final QName textMatch = new QName(caldavNamespace,
-                                                  "text-match");

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

@@ -154 +154 @@
-   * @throws CalFacadeException
-   */
-
+static 
-    Calendar cal = new Calendar();
-
@@ -173 +173 @@
-      return null;
-    }
-
+
-    HashMap added = new HashMap();
-
@@ -203 +203 @@
-      return null;
-    }
-
+
-    HashMap added = new HashMap();
-
@@ -228 +228 @@
-  }
-
-n EventVO
+ BwEvent
-   *
-   * @param val
@@ -238 +238 @@
-  }
-
-EventVO
+BwEvent
-   *
-   * @param val
@@ -277 +277 @@
-
-      UnfoldingReader ufrdr = new UnfoldingReader(new StringReader(val), true);
-
+
-      //return fromIcal(cal, bldr.build(new UnfoldingReader(new StringReader(val))));
-      return fromIcal(cal, bldr.build(ufrdr));
@@ -366 +366 @@
-
-      UnfoldingReader ufrdr = new UnfoldingReader(new StringReader(val), true);
-
+
-      return bldr.build(ufrdr);
-    } catch (CalFacadeException cfe) {
@@ -375 +375 @@
-  }
-
+  /** Create a Calendar object from the named timezone
+   *
+   * @param tzid       String timezone id
+   * @return Calendar
+   * @throws CalFacadeException
+   */
+  public Calendar getTzCalendar(String tzid) throws CalFacadeException {
+    try {
+      Calendar cal = newIcal();
+
+      addIcalTimezone(cal, tzid, null, null);
+
+      return cal;
+    } catch (CalFacadeException cfe) {
+      throw cfe;
+    } catch (Throwable t) {
+      throw new CalFacadeException(t);
+    }
+  }
+
+  /** Create a Calendar object from the named timezone and convert to
+   * a String representation
+   *
+   * @param tzid       String timezone id
+   * @return String
+   * @throws CalFacadeException
+   */
+  public String toStringTzCalendar(String tzid) throws CalFacadeException {
+    Calendar ical = getTzCalendar(tzid);
+
+    CalendarOutputter calOut = new CalendarOutputter(true);
+
+    StringWriter sw = new StringWriter();
+
+    try {
+      calOut.output(ical, sw);
+
+      return sw.toString();
+    } catch (Throwable t) {
+      throw new CalFacadeException(t);
+    }
+  }
+
-  /** Convert the given string representation of an Icalendar object to a
-   * collection of VEvent
@@ -391 +434 @@
-
-      UnfoldingReader ufrdr = new UnfoldingReader(new StringReader(val), true);
-
+
-      Calendar cal = bldr.build(ufrdr);
-      Vector evs = new Vector();
@@ -510 +553 @@
-   * and add it to the calendar.
-   */
- 
+
-                                HashMap added) throws CalFacadeException {
-    BwUser owner = ev.getOwner();
@@ -520 +563 @@
-    }
-  }
-
- 
- 
+
+
+
-                               HashMap added) throws CalFacadeException {
-    VTimeZone vtz;
-
-
+
+
+
-      return;
-    }
@@ -533 +577 @@
-      debugMsg("Look for timezone with id " + tzid);
-    }
-
+
-    vtz = cb.findTimeZone(tzid, owner);
-    if (vtz != null) {
@@ -543 +587 @@
-      debugMsg("Didn't find timezone with id " + tzid);
-    }
-
-
-
-
+
+
+
+
+
+
-  private static void setSystemProperties() throws CalFacadeException {
-    try {

trunk/calendar3/test/caldavTestData/eg/eg15.test

@@ -11 +11 @@
-CONTENTTYPE: text/xml
-
-
-
-
-
-
-
-
-
-
+
-

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

@@ -80 +80 @@
-//import java.net.Authenticator;
-//import java.net.PasswordAuthentication;
+import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.TreeSet;
@@ -162 +163 @@
-  }
-
-Vector results = new Vector
+ArrayList results = new ArrayList
-
-  /** Main method
@@ -187 +188 @@
-        // Either use the test list or the sorted directory contents.
-
-Vector tests = new Vector
+ArrayList tests = new ArrayList
-
-        if (testListName != null) {