[Bedework-commit] caldav r195 - in trunk:
boeingexchange/src/edu/rpi/cct/bedework/caldav
bwcaldav/src/org/bedework/caldav/bwserver
domino/src/edu/rpi/cct/bedework/caldav
google/src/edu/rpi/cct/bedework/caldav
server/src/org/bedework/caldav/server
server/src/org/bedework/caldav/server/calquery
svnadmin at bedework.org
svnadmin at bedework.org
Sun Sep 2 01:03:12 EDT 2007
Author: douglm
Date: 2007-09-02 01:03:04 -0400 (Sun, 02 Sep 2007)
New Revision: 195
Modified:
trunk/boeingexchange/src/edu/rpi/cct/bedework/caldav/BexchangeSysIntfImpl.java
trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
trunk/domino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java
trunk/google/src/edu/rpi/cct/bedework/caldav/GoogleSysIntfImpl.java
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/PostMethod.java
trunk/server/src/org/bedework/caldav/server/SysIntf.java
trunk/server/src/org/bedework/caldav/server/calquery/FreeBusyQuery.java
Log:
Remove BwFreeBusy class in favor of BwEvent throughout
Process realtime response from other server. Now shows some sort of freebusy from remote system
Modified: trunk/boeingexchange/src/edu/rpi/cct/bedework/caldav/BexchangeSysIntfImpl.java
===================================================================
--- trunk/boeingexchange/src/edu/rpi/cct/bedework/caldav/BexchangeSysIntfImpl.java 2007-09-01 05:11:45 UTC (rev 194)
+++ trunk/boeingexchange/src/edu/rpi/cct/bedework/caldav/BexchangeSysIntfImpl.java 2007-09-02 05:03:04 UTC (rev 195)
@@ -60,7 +60,6 @@
import org.bedework.calfacade.BwDateTime;
import org.bedework.calfacade.BwEvent;
import org.bedework.calfacade.BwEventProxy;
-import org.bedework.calfacade.BwFreeBusy;
import org.bedework.calfacade.BwUser;
import org.bedework.calfacade.RecurringRetrievalMode;
import org.bedework.calfacade.ScheduleResult;
@@ -441,10 +440,10 @@
throw new WebdavException("unimplemented");
}
- public BwFreeBusy getFreeBusy(BwCalendar cal,
- String account,
- BwDateTime start,
- BwDateTime end) throws WebdavException {
+ public BwEvent getFreeBusy(BwCalendar cal,
+ String account,
+ BwDateTime start,
+ BwDateTime end) throws WebdavException {
/* Create a url something like:
* http://t1.egenconsulting.com:80/servlet/Freetime/John?start-min=2006-07-11T12:00:00Z&start-max=2006-07-16T12:00:00Z
*/
@@ -483,7 +482,7 @@
debugMsg("Got response \n" + resp.getResponseBodyAsString());
}
/*
- BwFreeBusy fb = makeFb(start, end,
+ BwEvent fb = makeFb(start, end,
"000010110000111100001101" +
"000010110000111100001101" +
"000010110000111100001101" +
@@ -503,8 +502,8 @@
while (fbit.hasNext()) {
Object o = fbit.next();
- if (o instanceof BwFreeBusy) {
- return (BwFreeBusy)o;
+ if (o instanceof BwEvent) {
+ return (BwEvent)o;
}
}
Modified: trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
===================================================================
--- trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java 2007-09-01 05:11:45 UTC (rev 194)
+++ trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java 2007-09-02 05:03:04 UTC (rev 195)
@@ -32,7 +32,6 @@
import org.bedework.calfacade.BwDateTime;
import org.bedework.calfacade.BwEvent;
import org.bedework.calfacade.BwEventProxy;
-import org.bedework.calfacade.BwFreeBusy;
import org.bedework.calfacade.BwSystem;
import org.bedework.calfacade.BwUser;
import org.bedework.calfacade.BwUserInfo;
@@ -542,10 +541,10 @@
}
}
- public BwFreeBusy getFreeBusy(BwCalendar cal,
- String account,
- BwDateTime start,
- BwDateTime end) throws WebdavException {
+ public BwEvent getFreeBusy(BwCalendar cal,
+ String account,
+ BwDateTime start,
+ BwDateTime end) throws WebdavException {
try {
BwUser user = getSvci().findUser(account, false);
if (user == null) {
Modified: trunk/domino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java
===================================================================
--- trunk/domino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java 2007-09-01 05:11:45 UTC (rev 194)
+++ trunk/domino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java 2007-09-02 05:03:04 UTC (rev 195)
@@ -59,8 +59,8 @@
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.BwDateTime;
import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.BwEventObj;
import org.bedework.calfacade.BwEventProxy;
-import org.bedework.calfacade.BwFreeBusy;
import org.bedework.calfacade.BwFreeBusyComponent;
import org.bedework.calfacade.BwUser;
import org.bedework.calfacade.RecurringRetrievalMode;
@@ -439,10 +439,10 @@
throw new WebdavException("unimplemented");
}
- public BwFreeBusy getFreeBusy(BwCalendar cal,
- String account,
- BwDateTime start,
- BwDateTime end) throws WebdavException {
+ public BwEvent getFreeBusy(BwCalendar cal,
+ String account,
+ BwDateTime start,
+ BwDateTime end) throws WebdavException {
/* Create a url something like:
* http://t1.egenconsulting.com:80/servlet/Freetime/John?start-min=2006-07-11T12:00:00Z&start-max=2006-07-16T12:00:00Z
*/
@@ -488,10 +488,10 @@
while (fbit.hasNext()) {
Object o = fbit.next();
- if (o instanceof BwFreeBusy) {
- BwFreeBusy fb = (BwFreeBusy)o;
+ if (o instanceof BwEvent) {
+ BwEvent fb = (BwEvent)o;
- Collection<BwFreeBusyComponent> times = fb.getTimes();
+ Collection<BwFreeBusyComponent> times = fb.getFreeBusyPeriods();
if (times != null) {
for (BwFreeBusyComponent fbcomp: times) {
@@ -507,14 +507,14 @@
}
}
- BwFreeBusy fb = new BwFreeBusy();
+ BwEvent fb = new BwEventObj();
fb.setDtstart(start);
fb.setDtend(end);
BwFreeBusyComponent fbcomp = new BwFreeBusyComponent();
- fb.addTime(fbcomp);
+ fb.addFreeBusyPeriod(fbcomp);
fbcomp.setType(BwFreeBusyComponent.typeBusy);
Modified: trunk/google/src/edu/rpi/cct/bedework/caldav/GoogleSysIntfImpl.java
===================================================================
--- trunk/google/src/edu/rpi/cct/bedework/caldav/GoogleSysIntfImpl.java 2007-09-01 05:11:45 UTC (rev 194)
+++ trunk/google/src/edu/rpi/cct/bedework/caldav/GoogleSysIntfImpl.java 2007-09-02 05:03:04 UTC (rev 195)
@@ -59,10 +59,11 @@
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.BwDateTime;
import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.BwEventObj;
import org.bedework.calfacade.BwEventProxy;
-import org.bedework.calfacade.BwFreeBusy;
import org.bedework.calfacade.BwFreeBusyComponent;
import org.bedework.calfacade.BwUser;
+import org.bedework.calfacade.CalFacadeDefs;
import org.bedework.calfacade.RecurringRetrievalMode;
import org.bedework.calfacade.ScheduleResult;
import org.bedework.calfacade.base.BwShareableDbentity;
@@ -359,7 +360,7 @@
throw new WebdavException("unimplemented");
}
- public BwFreeBusy getFreeBusy(BwCalendar cal,
+ public BwEvent getFreeBusy(BwCalendar cal,
String account,
BwDateTime start,
BwDateTime end) throws WebdavException {
@@ -414,7 +415,12 @@
// Send the request and receive the response:
Feed resultFeed = (Feed)svc.query(q, Feed.class);
- BwFreeBusy fb = new BwFreeBusy(new BwUser(account), start, end);
+ BwEvent fb = new BwEventObj();
+
+ fb.setEntityType(CalFacadeDefs.entityTypeFreeAndBusy);
+ fb.setOwner(new BwUser(account));
+ fb.setDtstart(start);
+ fb.setDtend(end);
//assignGuid(fb);
for (Entry e: resultFeed.getEntries()) {
@@ -464,7 +470,7 @@
fbc.addPeriod(icalStart, icalEnd);
}
- fb.addTime(fbc);
+ fb.addFreeBusyPeriod(fbc);
}
return fb;
Modified: trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java 2007-09-01 05:11:45 UTC (rev 194)
+++ trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java 2007-09-02 05:03:04 UTC (rev 195)
@@ -59,7 +59,6 @@
import org.bedework.caldav.server.filter.Filter;
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.BwEvent;
-import org.bedework.calfacade.BwFreeBusy;
import org.bedework.calfacade.RecurringRetrievalMode;
import org.bedework.calfacade.RecurringRetrievalMode.Rmode;
import org.bedework.calfacade.env.CalEnvFactory;
@@ -628,7 +627,6 @@
if (o instanceof EventInfo) {
pcr.created = putEvent(bwnode, (EventInfo)o, create, ifEtag);
- } else if (o instanceof BwFreeBusy) {
} else {
fail = true;
break;
@@ -1237,9 +1235,9 @@
FreeBusyQuery freeBusy,
int depth) throws WebdavException {
try {
- BwFreeBusy fb = freeBusy.getFreeBusy(sysi, cnode.getCalendar(),
- cnode.getOwner(),
- depth);
+ BwEvent fb = freeBusy.getFreeBusy(sysi, cnode.getCalendar(),
+ cnode.getOwner(),
+ depth);
cnode.setFreeBusy(fb);
} catch (WebdavException we) {
Modified: trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java 2007-09-01 05:11:45 UTC (rev 194)
+++ trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java 2007-09-02 05:03:04 UTC (rev 195)
@@ -55,7 +55,7 @@
package org.bedework.caldav.server;
import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwFreeBusy;
+import org.bedework.calfacade.BwEvent;
import org.bedework.calfacade.BwProperty;
import org.bedework.calfacade.BwUser;
import org.bedework.calfacade.RecurringRetrievalMode;
@@ -250,7 +250,7 @@
* @param fb
* @throws WebdavException
*/
- public void setFreeBusy(BwFreeBusy fb) throws WebdavException {
+ public void setFreeBusy(BwEvent fb) throws WebdavException {
try {
VFreeBusy vfreeBusy = VFreeUtil.toVFreeBusy(fb);
if (vfreeBusy != null) {
Modified: trunk/server/src/org/bedework/caldav/server/PostMethod.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/PostMethod.java 2007-09-01 05:11:45 UTC (rev 194)
+++ trunk/server/src/org/bedework/caldav/server/PostMethod.java 2007-09-02 05:03:04 UTC (rev 195)
@@ -56,7 +56,6 @@
import org.bedework.caldav.server.SysIntf.CalUserInfo;
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.BwEvent;
-import org.bedework.calfacade.BwFreeBusy;
import org.bedework.calfacade.BwOrganizer;
import org.bedework.calfacade.ScheduleResult;
import org.bedework.calfacade.ScheduleResult.ScheduleRecipientResult;
@@ -464,7 +463,7 @@
property(CaldavTags.recipient, srr.recipient);
setReqstat(srr.status);
- BwFreeBusy rfb = srr.freeBusy;
+ BwEvent rfb = srr.freeBusy;
if (rfb != null) {
rfb.setOrganizer(pars.ic.getOrganizer());
Modified: trunk/server/src/org/bedework/caldav/server/SysIntf.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/SysIntf.java 2007-09-01 05:11:45 UTC (rev 194)
+++ trunk/server/src/org/bedework/caldav/server/SysIntf.java 2007-09-02 05:03:04 UTC (rev 195)
@@ -30,7 +30,6 @@
import org.bedework.calfacade.BwDateTime;
import org.bedework.calfacade.BwEvent;
import org.bedework.calfacade.BwEventProxy;
-import org.bedework.calfacade.BwFreeBusy;
import org.bedework.calfacade.BwUserInfo;
import org.bedework.calfacade.RecurringRetrievalMode;
import org.bedework.calfacade.ScheduleResult;
@@ -393,13 +392,13 @@
* @param account
* @param start
* @param end
- * @return BwFreeBusy
+ * @return BwEvent
* @throws WebdavException
*/
- public BwFreeBusy getFreeBusy(BwCalendar cal,
- String account,
- BwDateTime start,
- BwDateTime end) throws WebdavException;
+ public BwEvent getFreeBusy(BwCalendar cal,
+ String account,
+ BwDateTime start,
+ BwDateTime end) throws WebdavException;
/** Check the access for the given entity. Returns the current access
* or null or optionally throws a no access exception.
Modified: trunk/server/src/org/bedework/caldav/server/calquery/FreeBusyQuery.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/calquery/FreeBusyQuery.java 2007-09-01 05:11:45 UTC (rev 194)
+++ trunk/server/src/org/bedework/caldav/server/calquery/FreeBusyQuery.java 2007-09-02 05:03:04 UTC (rev 195)
@@ -30,7 +30,9 @@
import org.bedework.caldav.server.SysIntf;
import org.bedework.calfacade.base.TimeRange;
import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwFreeBusy;
+import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.BwEventObj;
+import org.bedework.calfacade.CalFacadeDefs;
import edu.rpi.cct.webdav.servlet.shared.WebdavBadRequest;
import edu.rpi.cct.webdav.servlet.shared.WebdavException;
@@ -98,12 +100,12 @@
* @param cal
* @param account
* @param depth
- * @return BwFreeBusy
+ * @return BwEvent
* @throws WebdavException
*/
- public BwFreeBusy getFreeBusy(SysIntf sysi, BwCalendar cal,
- String account,
- int depth) throws WebdavException {
+ public BwEvent getFreeBusy(SysIntf sysi, BwCalendar cal,
+ String account,
+ int depth) throws WebdavException {
try {
int calType = cal.getCalType();
@@ -126,9 +128,10 @@
cal = newCal;
}
- BwFreeBusy fb;
+ BwEvent fb;
if (cal == null) {
- fb = new BwFreeBusy();
+ fb = new BwEventObj();
+ fb.setEntityType(CalFacadeDefs.entityTypeFreeAndBusy);
fb.setDtstart(timeRange.getStart());
fb.setDtend(timeRange.getEnd());
} else {
More information about the Bedework-commit
mailing list