[Bedework-commit] caldavimpl r65 - in releases/bedework-3.6: boeingexchange/src/edu/rpi/cct/bedework/caldav/exchange bwcaldav/src/org/bedework/caldav/bwserver domino/src/edu/rpi/cct/bedework/caldav/domino google/src/edu/rpi/cct/bedework/caldav/google

[svnadmin at bedework.org]

Author: douglm
Date: 2010-09-09 10:24:05 -0400 (Thu, 09 Sep 2010)
New Revision: 65

Modified:
   releases/bedework-3.6/boeingexchange/src/edu/rpi/cct/bedework/caldav/exchange/BexchangeSysIntfImpl.java
   releases/bedework-3.6/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
   releases/bedework-3.6/domino/src/edu/rpi/cct/bedework/caldav/domino/DominoSysIntfImpl.java
   releases/bedework-3.6/google/src/edu/rpi/cct/bedework/caldav/google/GoogleSysIntfImpl.java
Log:
Use content-type to select icalendar or xcalendar parsing of PUT/POST content.

Allows us to accept XML icalendar entities

Modified: releases/bedework-3.6/boeingexchange/src/edu/rpi/cct/bedework/caldav/exchange/BexchangeSysIntfImpl.java
===================================================================
--- releases/bedework-3.6/boeingexchange/src/edu/rpi/cct/bedework/caldav/exchange/BexchangeSysIntfImpl.java	2010-09-03 20:15:09 UTC (rev 64)
+++ releases/bedework-3.6/boeingexchange/src/edu/rpi/cct/bedework/caldav/exchange/BexchangeSysIntfImpl.java	2010-09-09 14:24:05 UTC (rev 65)
@@ -757,6 +757,7 @@
 
   public SysiIcalendar fromIcal(final CalDAVCollection col,
                             final Reader rdr,
+                            final String contentType,
                             final IcalResultType rtype) throws WebdavException {
     throw new WebdavException("unimplemented");
   }

Modified: releases/bedework-3.6/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
===================================================================
--- releases/bedework-3.6/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2010-09-03 20:15:09 UTC (rev 64)
+++ releases/bedework-3.6/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2010-09-09 14:24:05 UTC (rev 65)
@@ -1358,10 +1358,11 @@
   }
 
   /* (non-Javadoc)
-   * @see org.bedework.caldav.server.sysinterface.SysIntf#fromIcal(org.bedework.caldav.server.CalDAVCollection, java.io.Reader, org.bedework.caldav.server.sysinterface.SysIntf.IcalResultType)
+   * @see org.bedework.caldav.server.sysinterface.SysIntf#fromIcal(org.bedework.caldav.server.CalDAVCollection, java.io.Reader, java.lang.String, org.bedework.caldav.server.sysinterface.SysIntf.IcalResultType)
    */
   public SysiIcalendar fromIcal(final CalDAVCollection col,
                                 final Reader rdr,
+                                final String contentType,
                                 final IcalResultType rtype) throws WebdavException {
     getSvci(); // Ensure open
     boolean rollback = true;
@@ -1372,7 +1373,8 @@
         bwcol = unwrap(col);
       }
 
-      Icalendar ic = trans.fromIcal(bwcol, new SysIntfReader(rdr, debug));
+      Icalendar ic = trans.fromIcal(bwcol, new SysIntfReader(rdr, debug),
+                                    contentType);
 
       if (rtype == IcalResultType.OneComponent) {
         if (ic.getComponents().size() != 1) {

Modified: releases/bedework-3.6/domino/src/edu/rpi/cct/bedework/caldav/domino/DominoSysIntfImpl.java
===================================================================
--- releases/bedework-3.6/domino/src/edu/rpi/cct/bedework/caldav/domino/DominoSysIntfImpl.java	2010-09-03 20:15:09 UTC (rev 64)
+++ releases/bedework-3.6/domino/src/edu/rpi/cct/bedework/caldav/domino/DominoSysIntfImpl.java	2010-09-09 14:24:05 UTC (rev 65)
@@ -798,7 +798,8 @@
 
   public SysiIcalendar fromIcal(final CalDAVCollection col,
                             final Reader rdr,
-                            final IcalResultType rtype) throws WebdavException {
+                            final String contentType,
+                           final IcalResultType rtype) throws WebdavException {
     throw new WebdavException("unimplemented");
   }
 

Modified: releases/bedework-3.6/google/src/edu/rpi/cct/bedework/caldav/google/GoogleSysIntfImpl.java
===================================================================
--- releases/bedework-3.6/google/src/edu/rpi/cct/bedework/caldav/google/GoogleSysIntfImpl.java	2010-09-03 20:15:09 UTC (rev 64)
+++ releases/bedework-3.6/google/src/edu/rpi/cct/bedework/caldav/google/GoogleSysIntfImpl.java	2010-09-09 14:24:05 UTC (rev 65)
@@ -735,11 +735,9 @@
     throw new WebdavException("unimplemented");
   }
 
-  /* (non-Javadoc)
-   * @see org.bedework.caldav.server.SysIntf#fromIcal(org.bedework.caldav.server.CalDAVCollection, java.io.Reader)
-   */
   public SysiIcalendar fromIcal(final CalDAVCollection col,
                                 final Reader rdr,
+                                final String contentType,
                                 final IcalResultType rtype) throws WebdavException {
     throw new WebdavException("unimplemented");
   }