[Bedework-commit] caldav r303 - in trunk/server/src/org/bedework/caldav/server: . calquery

[svnadmin at bedework.org]

Author: douglm
Date: 2008-11-20 15:11:55 -0500 (Thu, 20 Nov 2008)
New Revision: 303

Modified:
   trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java
   trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java
   trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java
   trunk/server/src/org/bedework/caldav/server/CaldavResourceNode.java
   trunk/server/src/org/bedework/caldav/server/calquery/CalendarData.java
Log:
Move a number of date time utility routines out into a shared package

Modified: trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java	2008-11-14 06:38:25 UTC (rev 302)
+++ trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java	2008-11-20 20:11:55 UTC (rev 303)
@@ -47,8 +47,8 @@
 import org.bedework.calfacade.env.CalOptionsFactory;
 import org.bedework.calfacade.svc.EventInfo;
 import org.bedework.calfacade.util.CalFacadeUtil;
-import org.bedework.calfacade.util.DateTimeUtil;
-import org.bedework.calfacade.util.DateTimeUtil.DatePeriod;
+import org.bedework.calfacade.util.BwDateTimeUtil;
+import org.bedework.calfacade.util.BwDateTimeUtil.DatePeriod;
 import org.bedework.icalendar.IcalTranslator;
 import org.bedework.icalendar.Icalendar;
 import org.bedework.icalendar.VFreeUtil;
@@ -1156,7 +1156,7 @@
 
       pars.contentType = "text/calendar; charset=UTF-8";
 
-      DatePeriod dp = DateTimeUtil.getPeriod(req.getParameter("start"),
+      DatePeriod dp = BwDateTimeUtil.getPeriod(req.getParameter("start"),
                                              req.getParameter("end"),
                                              java.util.Calendar.DATE, 31,
                                              java.util.Calendar.DATE, 32);
@@ -1215,7 +1215,7 @@
                                HttpServletResponse resp,
                                RequestPars pars) throws WebdavException {
     try {
-      DatePeriod dp = DateTimeUtil.getPeriod(req.getParameter("start"),
+      DatePeriod dp = BwDateTimeUtil.getPeriod(req.getParameter("start"),
                                              req.getParameter("end"),
                                              java.util.Calendar.DATE, 31,
                                              java.util.Calendar.DATE, 32 * 3);

Modified: trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java	2008-11-14 06:38:25 UTC (rev 302)
+++ trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java	2008-11-20 20:11:55 UTC (rev 303)
@@ -59,7 +59,6 @@
 import org.bedework.calfacade.BwUser;
 import org.bedework.calfacade.RecurringRetrievalMode;
 import org.bedework.calfacade.RecurringRetrievalMode.Rmode;
-import org.bedework.calfacade.util.DateTimeUtil;
 import org.bedework.icalendar.IcalTranslator;
 import org.bedework.icalendar.Icalendar;
 import org.bedework.icalendar.VFreeUtil;
@@ -70,6 +69,7 @@
 import edu.rpi.cmt.access.AccessPrincipal;
 import edu.rpi.cmt.access.PrivilegeDefs;
 import edu.rpi.cmt.access.Acl.CurrentAccess;
+import edu.rpi.sss.util.DateTimeUtil;
 import edu.rpi.sss.util.xml.XmlEmit;
 import edu.rpi.sss.util.xml.XmlUtil;
 import edu.rpi.sss.util.xml.tagdefs.AppleIcalTags;

Modified: trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java	2008-11-14 06:38:25 UTC (rev 302)
+++ trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java	2008-11-20 20:11:55 UTC (rev 303)
@@ -59,7 +59,6 @@
 import org.bedework.calfacade.BwEvent;
 import org.bedework.calfacade.BwUser;
 import org.bedework.calfacade.svc.EventInfo;
-import org.bedework.calfacade.util.DateTimeUtil;
 
 import org.bedework.icalendar.ComponentWrapper;
 import org.bedework.icalendar.IcalTranslator;
@@ -71,6 +70,7 @@
 import edu.rpi.cct.webdav.servlet.shared.WebdavProperty;
 import edu.rpi.cmt.access.AccessPrincipal;
 import edu.rpi.cmt.access.Acl.CurrentAccess;
+import edu.rpi.sss.util.DateTimeUtil;
 import edu.rpi.sss.util.xml.XmlEmit;
 import edu.rpi.sss.util.xml.tagdefs.CaldavTags;
 import edu.rpi.sss.util.xml.tagdefs.ICalTags;

Modified: trunk/server/src/org/bedework/caldav/server/CaldavResourceNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavResourceNode.java	2008-11-14 06:38:25 UTC (rev 302)
+++ trunk/server/src/org/bedework/caldav/server/CaldavResourceNode.java	2008-11-20 20:11:55 UTC (rev 303)
@@ -57,7 +57,6 @@
 import org.bedework.calfacade.BwCalendar;
 import org.bedework.calfacade.BwResource;
 import org.bedework.calfacade.BwUser;
-import org.bedework.calfacade.util.DateTimeUtil;
 
 import org.w3c.dom.Element;
 
@@ -65,6 +64,7 @@
 import edu.rpi.cmt.access.AccessPrincipal;
 import edu.rpi.cmt.access.PrivilegeDefs;
 import edu.rpi.cmt.access.Acl.CurrentAccess;
+import edu.rpi.sss.util.DateTimeUtil;
 
 import javax.xml.namespace.QName;
 

Modified: trunk/server/src/org/bedework/caldav/server/calquery/CalendarData.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/calquery/CalendarData.java	2008-11-14 06:38:25 UTC (rev 302)
+++ trunk/server/src/org/bedework/caldav/server/calquery/CalendarData.java	2008-11-20 20:11:55 UTC (rev 303)
@@ -28,7 +28,7 @@
 import org.bedework.caldav.server.CaldavComponentNode;
 import org.bedework.calfacade.base.TimeRange;
 import org.bedework.calfacade.BwDateTime;
-import org.bedework.calfacade.util.DateTimeUtil;
+import org.bedework.calfacade.util.BwDateTimeUtil;
 
 import edu.rpi.cct.webdav.servlet.shared.WebdavBadRequest;
 import edu.rpi.cct.webdav.servlet.shared.WebdavException;
@@ -466,7 +466,7 @@
         throw new WebdavBadRequest();
       }
 
-      start = DateTimeUtil.getDateTimeUTC(nmAttr.getNodeValue());
+      start = BwDateTimeUtil.getDateTimeUTC(nmAttr.getNodeValue());
 
       nmAttr = nnm.getNamedItem("end");
 
@@ -474,7 +474,7 @@
         throw new WebdavBadRequest();
       }
 
-      end = DateTimeUtil.getDateTimeUTC(nmAttr.getNodeValue());
+      end = BwDateTimeUtil.getDateTimeUTC(nmAttr.getNodeValue());
     } catch (Throwable t) {
       throw new WebdavBadRequest();
     }