Changeset 774

Timestamp:

07/13/06 16:31:46

Author:

douglm

Message:

Changes to create meeting object
Add some accept... headers
Fix up domino interface to handle xml

Files:

• trunk/calendar3/caldavClientApi/build.xml (modified) (1 diff)
• trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/BwIcalTrans.java (modified) (5 diffs)
• trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java (modified) (2 diffs)
• trunk/calendar3/caldavDomino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java (modified) (7 diffs)

trunk/calendar3/caldavClientApi/build.xml

@@ -44 +44 @@
-      <pathelement location="${ical4j.jar}"/>
-      <pathelement location="${log4j.jar}"/>
+      <pathelement location="${hibernate.jar}"/>
-
-      <!-- Include the location of the compiled calendar classes -->

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

@@ -33 +33 @@
-import org.bedework.icalendar.IcalTranslator;
-
+import net.fortuna.ical4j.model.Calendar;
+import net.fortuna.ical4j.model.Dur;
+import net.fortuna.ical4j.model.ParameterList;
+import net.fortuna.ical4j.model.PropertyList;
-import net.fortuna.ical4j.model.TimeZone;
+import net.fortuna.ical4j.model.component.VEvent;
+import net.fortuna.ical4j.model.parameter.TzId;
+import net.fortuna.ical4j.model.property.Description;
+import net.fortuna.ical4j.model.property.DtStart;
+import net.fortuna.ical4j.model.property.Duration;
+import net.fortuna.ical4j.model.property.Location;
+import net.fortuna.ical4j.model.property.Summary;
+import net.fortuna.ical4j.model.property.Uid;
+import net.fortuna.ical4j.model.property.Url;
-
-import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URI;
-import java.util.Collection;
-import java.util.List;
+import java.util.Properties;
+
+import org.hibernate.Hibernate;
+import org.hibernate.id.Configurable;
+import org.hibernate.id.UUIDHexGenerator;
-
-/** Translate to/from ical. This requires the ability to get timezone info so
@@ -45 +65 @@
- */
-public class BwIcalTrans {
+  private transient UUIDHexGenerator uuidGen;
+
-  private boolean debug;
-
@@ -99 +121 @@
-  public TimeZone getTimeZone(String tzid) throws CalFacadeException {
-    return svci.getTimezones().getTimeZone(tzid);
+  }
+
+  /**
+   * @param startDt
+   * @param tzid
+   * @param duration - int minutes
+   * @param summary
+   * @param description
+   * @param location
+   * @param uri  - URI or null
+   * @return Calendar
+   * @throws Throwable
+   */
+  public Calendar makeMeeting(String startDt,
+                              String tzid,
+                              int duration,
+                              String summary,
+                              String description,
+                              String location,
+                              URI uri) throws Throwable {
+    String guid = getGuid();
+
+    Calendar vcal = IcalTranslator.newIcal();
+
+    VEvent ev = new VEvent();
+
+    vcal.getComponents().add(ev);
+
+    PropertyList props = ev.getProperties();
+
+    TzId tz = new TzId(tzid);
+    ParameterList aList = new ParameterList();
+
+    aList.add(tz);
+
+    props.add(new DtStart(aList, startDt));
+
+    props.add(new Duration(new Dur(0, 0, duration, 0)));
+
+    props.add(new Uid(guid));
+
+    if (summary != null) {
+      props.add(new Summary(summary));
+    }
+
+    if (description != null) {
+      props.add(new Description(description));
+    }
+
+    if (location != null) {
+      props.add(new Location(location));
+    }
+
+    if (uri != null) {
+      props.add(new Url(uri));
+    }
+
+    return vcal;
-  }
-
@@ -140 +220 @@
-   * @throws Throwable
-   */
+  public Collection getFreeBusy(Reader in) throws Throwable {
+    return trans.fromIcal(null, in);
+  }
+
+  /**
+   * @param in
+   * @return Collection
+   * @throws Throwable
+   */
-  public Collection getFreeBusy(InputStreamReader in) throws Throwable {
-    return trans.fromIcal(null, in);
@@ -170 +259 @@
-    }
-  }
+
+  /* ====================================================================
+   *                         Private methods
+   * ==================================================================== */
+
+  private String getGuid() {
+    return "CAL-" + (String)getUuidGen().generate(null, null) +
+           "freebusy.bedework.org";
+  }
+
+  /* Use the hibernate uid generator */
+  private UUIDHexGenerator getUuidGen() {
+    if (uuidGen != null) {
+      return uuidGen;
+    }
+
+    Properties uidprops = new Properties();
+    uidprops.setProperty("separator", "-");
+    uuidGen = new UUIDHexGenerator();
+    ((Configurable)uuidGen).configure(Hibernate.STRING, uidprops, null);
+    return uuidGen;
+  }
-}

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

@@ -66 +66 @@
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.contrib.ssl.BaseProtocolSocketFactory;
+import org.apache.commons.httpclient.methods.EntityEnclosingMethod;
-import org.apache.commons.httpclient.protocol.Protocol;
-//import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
@@ -230 +231 @@
-    }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-

trunk/calendar3/caldavDomino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java

@@ -69 +69 @@
-import edu.rpi.cct.webdav.servlet.shared.WebdavException;
-import edu.rpi.cct.webdav.servlet.shared.WebdavIntfException;
+import edu.rpi.sss.util.xml.XmlUtil;
-
-import net.fortuna.ical4j.model.Calendar;
@@ -77 +78 @@
-import org.apache.commons.httpclient.NoHttpResponseException;
-import org.apache.log4j.Logger;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
-
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.Serializable;
+import java.io.StringReader;
-import java.net.URI;
-import java.net.URLDecoder;
@@ -92 +99 @@
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
-
-/** Domino implementation of SysIntf.
@@ -237 +246 @@
-                 "start-max=" + makeDateTime(end));
-
+      req.addHeader("Accept",
+                    "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5");
+      req.addHeader("Accept-Language", "en-us,en;q=0.7,es;q=0.3");
+      req.addHeader("Accept-Encoding", "gzip,deflate");
+      req.addHeader("Accept-Charset", "ISO-8859-1,utf-8;q=0.7,*;q=0.7");
-      CaldavResp resp = send(req, di);
-
-
-
+
+
+
+
+
+
+
+
+
-
-      /* Domino returns free time - invert to get busy time
@@ -386 +407 @@
-   * ==================================================================== */
-
+  /* <?xml version="1.0" encoding="UTF-8"?>
+   <iCalendar>
+   <vcalendar method="REPLY" version="2.0" prodid="-//IBM Domino Freetime//NONSGML Prototype//EN">
+   <vfreebusy>
+   <attendee>John</attendee>
+   <url>http://t1.egenconsulting.com:80/servlet/Freetime/John</url>
+   <dtstamp>20060713T185253Z</dtstamp>
+   <dtstart>20060717T030000Z</dtstart>
+   <dtend>20060723T030000Z</dtend>
+   <freebusy fbtype="FREE">20060717T130000Z/20060717T160000Z</freebusy>
+   <freebusy fbtype="FREE">20060717T170000Z/20060717T210000Z</freebusy>
+   <freebusy fbtype="FREE">20060718T130000Z/20060718T160000Z</freebusy>
+   <freebusy fbtype="FREE">20060718T170000Z/20060718T210000Z</freebusy>
+   <freebusy fbtype="FREE">20060719T130000Z/20060719T160000Z</freebusy>
+   <freebusy fbtype="FREE">20060719T170000Z/20060719T210000Z</freebusy>
+   <freebusy fbtype="FREE">20060720T130000Z/20060720T160000Z</freebusy>
+   <freebusy fbtype="FREE">20060720T170000Z/20060720T210000Z</freebusy>
+   <freebusy fbtype="FREE">20060721T130000Z/20060721T160000Z</freebusy>
+   <freebusy fbtype="FREE">20060721T170000Z/20060721T210000Z</freebusy>
+   </vfreebusy>
+
+   </vcalendar>
+   </iCalendar>
+   */
+  private String makeVfb(Reader rdr) throws WebdavException{
+    try {
+      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+      factory.setNamespaceAware(true);
+
+      DocumentBuilder builder = factory.newDocumentBuilder();
+
+      Document doc = builder.parse(new InputSource(rdr));
+
+      StringBuffer sb = new StringBuffer();
+
+      sb.append("BEGIN:VCALENDAR\n");
+      sb.append("VERSION:2.0\n");
+      sb.append("PRODID:-//Bedework Domino/caldav interface//EN\n");
+      sb.append("BEGIN:VFREEBUSY\n");
+
+      Element root = doc.getDocumentElement(); // </iCalendar>
+      Element child = getOnlyChild(root);  //  </vcalendar>
+
+      child = getOnlyChild(child);  //  </vfreebusy>
+
+      Element[] children = getChildren(child);
+
+      for (int i = 0; i < children.length; i++) {
+        Element curnode = children[i];
+
+        String nm = curnode.getLocalName();
+
+        if (nm.equals("attendee")) {
+          sb.append("ATTENDEE:");
+          sb.append(getElementContent(curnode));
+          sb.append("\n");
+        } else if (nm.equals("url")) {
+          sb.append("URL:");
+          sb.append(getElementContent(curnode));
+          sb.append("\n");
+        } else if (nm.equals("dtstamp")) {
+          sb.append("DTSTAMP:");
+          sb.append(getElementContent(curnode));
+          sb.append("\n");
+        } else if (nm.equals("dtstart")) {
+          sb.append("DTSTART:");
+          sb.append(getElementContent(curnode));
+          sb.append("\n");
+        } else if (nm.equals("dtend")) {
+          sb.append("DTEND:");
+          sb.append(getElementContent(curnode));
+          sb.append("\n");
+        } else if (nm.equals("freebusy")) {
+          sb.append("FREEBUSY;FBTYPE=FREE:");
+          sb.append(getElementContent(curnode));
+          sb.append("\n");
+        }
+      }
+      sb.append("END:VFREEBUSY\n");
+      sb.append("END:VCALENDAR\n");
+
+      return sb.toString();
+    } catch (SAXException e) {
+      throw new WebdavException(HttpServletResponse.SC_BAD_REQUEST);
+    } catch (Throwable t) {
+      throw new WebdavException(t);
+    } finally {
+      if (rdr != null) {
+        try {
+          rdr.close();
+        } catch (Throwable t) {}
+      }
+    }
+  }
+
+  protected Element[] getChildren(Node nd) throws WebdavException {
+    try {
+      return XmlUtil.getElementsArray(nd);
+    } catch (Throwable t) {
+      if (debug) {
+        getLogger().error(this, t);
+      }
+
+      throw new WebdavException(t);
+    }
+  }
+
+  protected Element getOnlyChild(Node nd) throws WebdavException {
+    try {
+      return XmlUtil.getOnlyElement(nd);
+    } catch (Throwable t) {
+      if (debug) {
+        getLogger().error(this, t);
+      }
+
+      throw new WebdavException(t);
+    }
+  }
+
+  protected String getElementContent(Element el) throws WebdavException {
+    try {
+      return XmlUtil.getElementContent(el);
+    } catch (Throwable t) {
+      if (debug) {
+        getLogger().error(this, t);
+      }
+
+      throw new WebdavException(t);
+    }
+  }
+
-  private BwIcalTrans getTrans() throws WebdavIntfException {
-    try {
@@ -398 +550 @@
-  private String makeDateTime(BwDateTime dt) throws WebdavIntfException {
-    try {
+      /*
-      String utcdt = dt.getDate();
-
@@ -415 +568 @@
-
-      return sb.toString();
+      */
+      return dt.getDate();
-    } catch (Throwable t) {
-      throw new WebdavIntfException(t);