[Bedework-commit] calendarapi r237 - in trunk: calsvc/src/org/bedework/calsvc calsvci/src/org/bedework/calsvci

[svnadmin at bedework.org]

Author: douglm
Date: 2007-03-22 11:59:31 -0400 (Thu, 22 Mar 2007)
New Revision: 237

Modified:
   trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
   trunk/calsvci/src/org/bedework/calsvci/CalSvcI.java
Log:
Allow principals - at least user principals - as calendar user addresses - because we're getting them.

Modified: trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-03-20 18:00:29 UTC (rev 236)
+++ trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-03-22 15:59:31 UTC (rev 237)
@@ -541,6 +541,18 @@
         throw new CalFacadeException("org.bedework.error.nullcaladdr");
       }
 
+      BwSystem syspars = getSyspars();
+      String userRoot = syspars.getUserPrincipalRoot() + "/";
+
+      if (caladdr.startsWith(userRoot)) {
+        String u = caladdr.substring(userRoot.length());
+        if (u.endsWith("/")) {
+          return u.substring(0, u.length() - 1);
+        }
+
+        return u;
+      }
+
       String sysid = getSysid();
       int atpos = sysid.indexOf("@");
 

Modified: trunk/calsvci/src/org/bedework/calsvci/CalSvcI.java
===================================================================
--- trunk/calsvci/src/org/bedework/calsvci/CalSvcI.java	2007-03-20 18:00:29 UTC (rev 236)
+++ trunk/calsvci/src/org/bedework/calsvci/CalSvcI.java	2007-03-22 15:59:31 UTC (rev 237)
@@ -324,6 +324,8 @@
    * <br/>with the associated account of <br/>
    * auser<br/>
    *
+   * <p>We're also going to allow user principals as we seem to be getting them.
+   *
    * <p>Whereever we need a user account use the converted value. Call
    * userToCaladdr for the inverse.
    *