[Bedework-commit] calendarapi r601 - in releases/bedework-3.4.1.1: calCore/src/org/bedework/calcore/hibernate calFacade/src/org/bedework/calfacade calsvc/src/org/bedework/calsvc

[svnadmin at bedework.org]

Author: douglm
Date: 2008-04-23 10:00:24 -0400 (Wed, 23 Apr 2008)
New Revision: 601

Modified:
   releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java
   releases/bedework-3.4.1.1/calFacade/src/org/bedework/calfacade/BwPrincipal.java
   releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/CalSvc.java
   releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/Scheduling.java
Log:
Remove isUnauthenticated method from AccessPrincipal and BwPrincipal. It ceased to work correctly some time ago. This prevented unauthenticated freebusy lookups from working.

ALso check for privScheduleFreeBusy instead of read freebusy access when getting inbox

Modified: releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java
===================================================================
--- releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java	2008-04-22 01:35:12 UTC (rev 600)
+++ releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java	2008-04-23 14:00:24 UTC (rev 601)
@@ -192,7 +192,7 @@
       throw new CalFacadeException(t);
     }
 
-    if (user.isUnauthenticated()) {
+    if (user.getUnauthenticated()) {
       currentMode = CalintfUtil.guestMode;
     } else {
       if (!publicAdmin) {

Modified: releases/bedework-3.4.1.1/calFacade/src/org/bedework/calfacade/BwPrincipal.java
===================================================================
--- releases/bedework-3.4.1.1/calFacade/src/org/bedework/calfacade/BwPrincipal.java	2008-04-22 01:35:12 UTC (rev 600)
+++ releases/bedework-3.4.1.1/calFacade/src/org/bedework/calfacade/BwPrincipal.java	2008-04-23 14:00:24 UTC (rev 601)
@@ -354,13 +354,6 @@
     getGroups().add(val);
   }
 
-  /**
-   * @return boolean true for a guest principal
-   */
-  public boolean isUnauthenticated() {
-    return account == null;
-  }
-
   /** Set of groupNames of which principal is a member. These are not just those
    * of which the principal is a direct member but also those it is a member of
    * by virtue of membership of other groups. For example <br/>

Modified: releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/CalSvc.java	2008-04-22 01:35:12 UTC (rev 600)
+++ releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/CalSvc.java	2008-04-23 14:00:24 UTC (rev 601)
@@ -985,7 +985,7 @@
         cali.init(getSysparsHandler().get(), null, currentUser,
                   pars.getPublicAdmin(), debug);
 
-        if (!currentUser.isUnauthenticated()) {
+        if (!currentUser.getUnauthenticated()) {
           users.logon(currentUser);
         }
 

Modified: releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/Scheduling.java
===================================================================
--- releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/Scheduling.java	2008-04-22 01:35:12 UTC (rev 600)
+++ releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/Scheduling.java	2008-04-23 14:00:24 UTC (rev 601)
@@ -147,7 +147,7 @@
 
       if (ev.getEntityType() == CalFacadeDefs.entityTypeFreeAndBusy) {
         // freebusy
-        outAccess = PrivilegeDefs.privReadFreeBusy;
+        outAccess = PrivilegeDefs.privScheduleFreeBusy;
       } else {
         outAccess = PrivilegeDefs.privScheduleRequest;
       }
@@ -163,7 +163,7 @@
       BwCalendar outBox = null;
 
       BwUser currentUser = getUser();
-      if (!currentUser.isUnauthenticated()) {
+      if (!currentUser.getUnauthenticated()) {
         outBox = getSpecialCalendar(getUser(),
                                     BwCalendar.calTypeOutbox,
                                     true, outAccess).cal;
@@ -1438,7 +1438,7 @@
 
       int priv;
       if (freeBusyRequest) {
-        priv = PrivilegeDefs.privReadFreeBusy;
+        priv = PrivilegeDefs.privScheduleFreeBusy;
       } else {
         priv = PrivilegeDefs.privScheduleRequest;
       }