[Bedework-commit] caldav r292 - 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
Thu Oct 2 11:36:39 EDT 2008
Author: douglm
Date: 2008-10-02 11:36:37 -0400 (Thu, 02 Oct 2008)
New Revision: 292
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/SysIntf.java
trunk/server/src/org/bedework/caldav/server/calquery/FreeBusyQuery.java
Log:
Undo the scheduling calendar code added a few days back.
make some further fixes to scheduling. Replies appear to work fine
Modified: trunk/boeingexchange/src/edu/rpi/cct/bedework/caldav/BexchangeSysIntfImpl.java
===================================================================
--- trunk/boeingexchange/src/edu/rpi/cct/bedework/caldav/BexchangeSysIntfImpl.java 2008-10-02 13:52:21 UTC (rev 291)
+++ trunk/boeingexchange/src/edu/rpi/cct/bedework/caldav/BexchangeSysIntfImpl.java 2008-10-02 15:36:37 UTC (rev 292)
@@ -531,11 +531,10 @@
}
/* (non-Javadoc)
- * @see org.bedework.caldav.server.SysIntf#makeCollection(org.bedework.calfacade.BwCalendar, boolean, boolean, java.lang.String)
+ * @see org.bedework.caldav.server.SysIntf#makeCollection(org.bedework.calfacade.BwCalendar, boolean, java.lang.String)
*/
public int makeCollection(BwCalendar cal,
boolean calendarCollection,
- boolean schedulingCalendarCollection,
String parentPath) throws WebdavException {
throw new WebdavException("unimplemented");
}
Modified: trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
===================================================================
--- trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java 2008-10-02 13:52:21 UTC (rev 291)
+++ trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java 2008-10-02 15:36:37 UTC (rev 292)
@@ -660,18 +660,13 @@
}
/* (non-Javadoc)
- * @see org.bedework.caldav.server.SysIntf#makeCollection(org.bedework.calfacade.BwCalendar, boolean, boolean, java.lang.String)
+ * @see org.bedework.caldav.server.SysIntf#makeCollection(org.bedework.calfacade.BwCalendar, boolean, java.lang.String)
*/
public int makeCollection(BwCalendar cal,
boolean calendarCollection,
- boolean schedulingCalendarCollection,
String parentPath) throws WebdavException {
if (calendarCollection) {
- if (schedulingCalendarCollection) {
- cal.setCalType(BwCalendar.calTypeSchedulingCollection);
- } else {
- cal.setCalType(BwCalendar.calTypeCollection);
- }
+ cal.setCalType(BwCalendar.calTypeCollection);
} else {
cal.setCalType(BwCalendar.calTypeFolder);
}
Modified: trunk/domino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java
===================================================================
--- trunk/domino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java 2008-10-02 13:52:21 UTC (rev 291)
+++ trunk/domino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java 2008-10-02 15:36:37 UTC (rev 292)
@@ -559,11 +559,10 @@
}
/* (non-Javadoc)
- * @see org.bedework.caldav.server.SysIntf#makeCollection(org.bedework.calfacade.BwCalendar, boolean, boolean, java.lang.String)
+ * @see org.bedework.caldav.server.SysIntf#makeCollection(org.bedework.calfacade.BwCalendar, boolean, java.lang.String)
*/
public int makeCollection(BwCalendar cal,
boolean calendarCollection,
- boolean schedulingCalendarCollection,
String parentPath) throws WebdavException {
throw new WebdavException("unimplemented");
}
Modified: trunk/google/src/edu/rpi/cct/bedework/caldav/GoogleSysIntfImpl.java
===================================================================
--- trunk/google/src/edu/rpi/cct/bedework/caldav/GoogleSysIntfImpl.java 2008-10-02 13:52:21 UTC (rev 291)
+++ trunk/google/src/edu/rpi/cct/bedework/caldav/GoogleSysIntfImpl.java 2008-10-02 15:36:37 UTC (rev 292)
@@ -489,11 +489,10 @@
}
/* (non-Javadoc)
- * @see org.bedework.caldav.server.SysIntf#makeCollection(org.bedework.calfacade.BwCalendar, boolean, boolean, java.lang.String)
+ * @see org.bedework.caldav.server.SysIntf#makeCollection(org.bedework.calfacade.BwCalendar, boolean, java.lang.String)
*/
public int makeCollection(BwCalendar cal,
boolean calendarCollection,
- boolean schedulingCalendarCollection,
String parentPath) throws WebdavException {
throw new WebdavException("unimplemented");
}
Modified: trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java 2008-10-02 13:52:21 UTC (rev 291)
+++ trunk/server/src/org/bedework/caldav/server/CaldavBWIntf.java 2008-10-02 15:36:37 UTC (rev 292)
@@ -973,7 +973,6 @@
resp.setStatus(sysi.makeCollection(newCal,
"MKCALENDAR".equalsIgnoreCase(req.getMethod()),
- bwnode.getSchedulingAllowed(),
parent.getPath()));
} catch (WebdavException we) {
throw we;
Modified: trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java 2008-10-02 13:52:21 UTC (rev 291)
+++ trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java 2008-10-02 15:36:37 UTC (rev 292)
@@ -64,7 +64,6 @@
import org.bedework.icalendar.Icalendar;
import org.bedework.icalendar.VFreeUtil;
-import edu.rpi.cct.webdav.servlet.shared.WebdavBadRequest;
import edu.rpi.cct.webdav.servlet.shared.WebdavException;
import edu.rpi.cct.webdav.servlet.shared.WebdavForbidden;
import edu.rpi.cct.webdav.servlet.shared.WebdavNsIntf;
@@ -106,8 +105,6 @@
private CurrentAccess currentAccess;
- private Boolean exists; // null for unknown.
-
private final static HashMap<QName, PropertyTagEntry> propertyNames =
new HashMap<QName, PropertyTagEntry>();
@@ -233,7 +230,7 @@
return true;
}
- if (type == BwCalendar.calTypeSchedulingCollection) {
+ if (type == BwCalendar.calTypeCollection) {
return true;
}
@@ -251,7 +248,7 @@
BwCalendar c = getCalendar(); // Unalias
- c.setCalType(BwCalendar.calTypeSchedulingCollection);
+ c.setCalType(BwCalendar.calTypeCollection);
}
public Collection getChildren() throws WebdavException {
@@ -311,6 +308,9 @@
}
}
+ /* (non-Javadoc)
+ * @see edu.rpi.cct.webdav.servlet.shared.WebdavNsNode#getContentString()
+ */
public String getContentString() throws WebdavException {
init(true);
@@ -477,7 +477,7 @@
if (XmlUtil.nodeMatches(val, WebdavTags.resourcetype)) {
Collection<Element> propVals = XmlUtil.getElements(val);
- boolean schedule = false;
+ //boolean schedule = false;
for (Element pval: propVals) {
if (XmlUtil.nodeMatches(pval, WebdavTags.collection)) {
@@ -491,11 +491,12 @@
}
if (XmlUtil.nodeMatches(pval, CaldavTags.scheduleCalendar)) {
- schedule = true;
+ //schedule = true;
continue;
}
}
+ /*
if (exists) {
if ((cal.getCalType() == BwCalendar.calTypeSchedulingCollection) != schedule) {
throw new WebdavBadRequest();
@@ -503,6 +504,7 @@
} else if (schedule) {
cal.setCalType(BwCalendar.calTypeSchedulingCollection);
}
+ */
return true;
}
@@ -600,9 +602,6 @@
xml.emptyTag(CaldavTags.scheduleOutbox);
} else if (calType == BwCalendar.calTypeCollection) {
xml.emptyTag(CaldavTags.calendar);
- } else if (calType == BwCalendar.calTypeSchedulingCollection) {
- xml.emptyTag(CaldavTags.calendar);
- xml.emptyTag(CaldavTags.scheduleCalendar);
}
xml.closeTag(WebdavTags.resourcetype);
Modified: trunk/server/src/org/bedework/caldav/server/SysIntf.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/SysIntf.java 2008-10-02 13:52:21 UTC (rev 291)
+++ trunk/server/src/org/bedework/caldav/server/SysIntf.java 2008-10-02 15:36:37 UTC (rev 292)
@@ -451,14 +451,12 @@
* @param cal Initialised collection object
*
* @param calendarCollection
- * @param schedulingCalendarCollection
* @param parentPath
* @return int status
* @throws WebdavException
*/
public int makeCollection(BwCalendar cal,
boolean calendarCollection,
- boolean schedulingCalendarCollection,
String parentPath) throws WebdavException;
/** Copy or move the collection to another location.
Modified: trunk/server/src/org/bedework/caldav/server/calquery/FreeBusyQuery.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/calquery/FreeBusyQuery.java 2008-10-02 13:52:21 UTC (rev 291)
+++ trunk/server/src/org/bedework/caldav/server/calquery/FreeBusyQuery.java 2008-10-02 15:36:37 UTC (rev 292)
@@ -107,7 +107,7 @@
throw new WebdavForbidden(WebdavTags.supportedReport);
}
- if ((depth == 0) && (calType != BwCalendar.calTypeSchedulingCollection)) {
+ if ((depth == 0) && (calType != BwCalendar.calTypeCollection)) {
/* Cannot return anything */
cal = null;
} else if ((depth == 1) && !cal.getCalendarCollection()) {
@@ -115,7 +115,7 @@
BwCalendar newCal = new BwCalendar();
for (BwCalendar ch: sysi.getCalendars(cal)) {
- if (ch.getCalType() == BwCalendar.calTypeSchedulingCollection) {
+ if (ch.getCalType() == BwCalendar.calTypeCollection) {
newCal.addChild(ch);
}
}
More information about the Bedework-commit
mailing list