[Bedework-commit] caldav r135 - in trunk: bwcaldav/src/org/bedework/caldav/bwserver server/src/org/bedework/caldav/server

[svnadmin at bedework.org]

Author: douglm
Date: 2007-03-24 20:38:43 -0400 (Sat, 24 Mar 2007)
New Revision: 135

Modified:
   trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
   trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java
   trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java
Log:
Allow super user access for caldav

Fix dav:getlastmodified format

Modified: trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
===================================================================
--- trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2007-03-22 15:59:31 UTC (rev 134)
+++ trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2007-03-25 00:38:43 UTC (rev 135)
@@ -750,9 +750,12 @@
 
     try {
       String runAsUser = account;
+      boolean superUser = false;
 
       if (account == null) {
         runAsUser = getEnv().getAppProperty("run.as.user");
+      } else if (account.equals("root")) {
+        superUser = true;
       }
 
       /* account is what we authenticated with.
@@ -771,6 +774,10 @@
                                          debug);
       svci = new CalSvcFactoryDefault().getSvc(pars);
 
+      if (superUser) {
+        svci.setSuperUser(true);
+      }
+
       svci.open();
       svci.beginTransaction();
 

Modified: trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java	2007-03-22 15:59:31 UTC (rev 134)
+++ trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java	2007-03-25 00:38:43 UTC (rev 135)
@@ -59,6 +59,7 @@
 import org.bedework.calfacade.BwUser;
 import org.bedework.calfacade.RecurringRetrievalMode;
 import org.bedework.calfacade.RecurringRetrievalMode.Rmode;
+import org.bedework.calfacade.util.CalFacadeUtil;
 import org.bedework.davdefs.CaldavDefs;
 import org.bedework.davdefs.CaldavTags;
 import org.bedework.davdefs.WebdavTags;
@@ -387,7 +388,11 @@
       return null;
     }
 
-    return cal.getLastmod();
+    try {
+      return CalFacadeUtil.fromISODateTimeUTCtoRfc822(cal.getLastmod());
+    } catch (Throwable t) {
+      throw new WebdavException(t);
+    }
   }
 
   /* ====================================================================

Modified: trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java	2007-03-22 15:59:31 UTC (rev 134)
+++ trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java	2007-03-25 00:38:43 UTC (rev 135)
@@ -59,6 +59,7 @@
 import org.bedework.calfacade.BwEvent;
 import org.bedework.calfacade.BwUser;
 import org.bedework.calfacade.svc.EventInfo;
+import org.bedework.calfacade.util.CalFacadeUtil;
 
 import org.bedework.davdefs.CaldavTags;
 import org.bedework.davdefs.WebdavTags;
@@ -817,7 +818,11 @@
       return null;
     }
 
-    return ev.getLastmod();
+    try {
+      return CalFacadeUtil.fromISODateTimeUTCtoRfc822(ev.getLastmod());
+    } catch (Throwable t) {
+      throw new WebdavException(t);
+    }
   }
 
   /* ====================================================================