Changeset 331

Timestamp:

04/05/06 10:16:45

Author:

douglm

Message:

1. Fix group selection at admin startup

2. Rollback on certain exceptional conditions.

3. More changes to make access information available to apps.
Removed getAcl from svci and calintf. The information is now available in the EventInfo? object and
in cloned calendar objects.

Note: this is still not fully functional. Access information is only partially available.

Files:

• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Ace.java (modified) (2 diffs)
• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Acl.java (modified) (4 diffs)
• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Privilege.java (modified) (1 diff)
• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Privileges.java (modified) (1 diff)
• trunk/calendar3/appcommon/src/org/bedework/appcommon/AccessAppUtil.java (modified) (4 diffs)
• trunk/calendar3/appcommon/src/org/bedework/appcommon/EventFormatter.java (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AccessUtil.java (modified) (5 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java (modified) (7 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (modified) (3 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/HibSession.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/Calintf.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/EventsI.java (modified) (1 diff)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java (modified) (3 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavComponentNode.java (modified) (9 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (3 diffs)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java (modified) (4 diffs)
• trunk/calendar3/lib/tlds/bedework.tld (modified) (2 diffs)
• trunk/calendar3/webclient/war/docs/calendar/emitCalendar.jsp (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (3 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/EmitAclTag.java (added)

trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Ace.java

@@ -343 +343 @@
-  }
-
+  /** Return an ace which matches the name and whoType.
+   *
+   * @param acl
+   * @param name
+   * @param whoType
+   * @return Ace   if we find a match else null
+   * @throws AccessException
+   */
+  public static Ace find(Acl acl,
+                         String name, int whoType) throws AccessException {
+    Iterator it = acl.getAces().iterator();
+    
+    while (it.hasNext()) {
+      Ace ace = (Ace)it.next();
+
+      if ((whoType == ace.getWhoType()) &&
+          ((whoType == whoTypeUnauthenticated) ||
+           (whoType == whoTypeOwner) || 
+            ace.whoMatch(name))) {
+        return ace;
+      }
+    }
+
+    return null;
+  }
+  
-  /* ====================================================================
-   *                 Decoding methods
@@ -368 +394 @@
-   * group but what's the inverted meaning?
-   *
-.
+
-   * defining the ace will be returned. This is needed for acl
-   * manipulation rather than evaluation.

trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Acl.java

@@ -88 +88 @@
-
-  /** Used while evaluating access */
-
+//
-
-  /** Constructor
@@ -123 +123 @@
-   */
-  public static class CurrentAccess {
+    /** The Acl used to evaluate the access. We should not necessarily 
+     * make this available to the client.
+     */
+    public Acl acl;
+    
-    /**  Allowed access for each privilege type 
-     * @see PrivilegeDefs
@@ -177 +182 @@
-    CurrentAccess ca = new CurrentAccess();
-    ca.desiredAccess = how;
-
+
+
+
-    setEncoded(acl);
-
@@ -259 +266 @@
-      }
-    } // getPrivileges
+    */
+    decode(acl);
+
+    if (authenticated) {
+      isOwner = who.getAccount().equals(owner);
+    }
+
+    StringBuffer debugsb = null;
+
+    if (debug) {
+      debugsb = new StringBuffer("Check access for '");
+      debugsb.append(new String(acl));
+      debugsb.append("' with authenticated = ");
+      debugsb.append(authenticated);
+      debugsb.append(" isOwner = ");
+      debugsb.append(isOwner);
+    }
+
+    Ace ace;
+    
+    getPrivileges: {
+      if (!authenticated) {
+        ace = Ace.find(this, null, Ace.whoTypeUnauthenticated);
+        if (ace != null) {
+          ca.privileges = ace.getHow();
+        }
+
+        break getPrivileges;
+      }
+
+      if (isOwner) {
+        ace = Ace.find(this, null, Ace.whoTypeOwner);
+        if (ace != null) {
+          ca.privileges = ace.getHow();
+        } else {
+          ca.privileges = defaultOwnerPrivileges;
+        }
+
+        break getPrivileges;
+      }
+
+      // Not owner - look for user
+      ace = Ace.find(this, who.getAccount(), Ace.whoTypeUser);
+      if (ace != null) {
+        ca.privileges = ace.getHow();
+        if (debug) {
+          debugsb.append("... For user got: " + new String(ca.privileges));
+        }
+
+        break getPrivileges;
+      }
+
+      // No specific user access - look for group access
+
+      if (who.getGroupNames() != null) {
+        Iterator it = who.getGroupNames().iterator();
+
+        while (it.hasNext()) {
+          String group = (String)it.next();
+          if (debug) {
+            debugsb.append("...Try access for group " + group);
+          }
+          ace = Ace.find(this, group, Ace.whoTypeGroup);
+          if (ace != null) {
+            ca.privileges = mergePrivileges(ca.privileges, ace.getHow());
+          }
+        }
+      }
+
+      if (ca.privileges != null) {
+        if (debug) {
+          debugsb.append("...For groups got: " + new String(ca.privileges));
+        }
+
+        break getPrivileges;
+      }
+
+      // "other" access set?
+      ace = Ace.find(this, null, Ace.whoTypeOther);
+      if (ace != null) {
+        ca.privileges = ace.getHow();
+
+        if (debug) {
+          debugsb.append("...For other got: " + new String(ca.privileges));
+        }
+
+        break getPrivileges;
+      }
+    } // getPrivileges
-
-    if (ca.privileges == null) {

trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Privilege.java

@@ -105 +105 @@
-  }
-
+  /** Constructor for non-abstract non-denial
+   *
+   * @param name
+   * @param description
+   * @param index
+   */
+  public Privilege(String name,
+                   String description,
+                   int index) {
+    this(name, description, false, false, index);
+  }
+
-  /**
-   * @param val

trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Privileges.java

@@ -104 +104 @@
-  
-  static {
-
-
-
-
-
-
-
+
+
+
+
+
-                                       privReadAcl);
-    
-    privs[privReadCurrentUserPrivilegeSet] =
-      new Privilege("read-current-user-privilege-set",
-false, false,
+
-                    privReadCurrentUserPrivilegeSet);
-    
-    privs[privReadFreeBusy] = new Privilege("view-free-busy", 
-                                            "View a users free busy information", 
-false, false, 
-
-false, false,
+
+
+
-                                     privWrite);
-    
-false, false,
-                                    privWriteAcl);
-
-privs[privWriteProperties] = new Privilege("write-properties", "Write calendar properties", false, false,
+privWriteAcl);
+
+privs[privWriteProperties] = new Privilege("write-properties", 
+                                           "Write calendar properties", 
-                                               privWriteProperties);
-    
-
+
+
-                                            privWriteContent);
-    
-false, false,
+
-                                    privBind);
-    
-false, false,
+
-                                      privUnbind);
-    
-false, false,
+
-                                      privUnlock);
-    

trunk/calendar3/appcommon/src/org/bedework/appcommon/AccessAppUtil.java

@@ -168 +168 @@
-          Ace ace = (Ace)it.next();
-
-
-
+
+
+
+
+
+
+
+
-        }
-      }
@@ -180 +186 @@
-    }
-  }
-
+
-  /** Produce an xml representation of supported privileges. This is the same
-   * at all points in the system and is identical to the webdav/caldav 
@@ -279 +285 @@
-  }
-  
-void emitAce(Ace ace, boolean denials
+boolean emitAce(Ace ace, boolean denials, boolean aceOpen
-    Collection privs = ace.getPrivs();
-emittedWho
+tagOpen
-
-    QName tag;
@@ -295 +301 @@
-
-      if (denials == p.getDenial()) {
-
+
+
+
-          emitAceWho(ace);
-emittedWho
+aceOpen
-        }
-
-
+
+
+
+
-        xml.emptyTag(privTags[p.getIndex()]);
-        xml.closeTag(tag);
-      }
-    }
-
-
-
-
+
+
+
+
+
+
-  }
-
-  private void emitAceWho(Ace ace) throws Throwable {
-    xml.openTag(WebdavTags.ace);
-
-    boolean invert = ace.getNotWho();
-

trunk/calendar3/appcommon/src/org/bedework/appcommon/EventFormatter.java

@@ -210 +210 @@
-    try {
-      if (xmlAccess == null) {
-
+
+
-        xmlAccess = AccessAppUtil.getXmlAclString(acl);
-      }

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AccessUtil.java

@@ -171 +171 @@
-                           Collection aces) throws CalFacadeException {
-    try {
-getAces(ent, privWriteAcl)
+checkAccess(ent, privWriteAcl, false).acl
-
-      Iterator it = aces.iterator();
@@ -182 +182 @@
-
-      ent.setAccess(new String(acl.encode()));
-    } catch (Throwable t) {
-      throw new CalFacadeException(t);
-    }
-  }
-
-  /** Return the acl representing the allowed access for the given object. This
-   * may be derived from an object higher up the tree.
-   *
-   * @param ent
-   * @return Acl
-   * @throws CalFacadeException
-   */
-  public Acl getAcl(BwShareableDbentity ent) throws CalFacadeException {
-    try {
-      return getAces(ent, privReadAcl);
-    } catch (CalFacadeAccessException cae) {
-      Acl acl = new Acl();
-      acl.defaultAccess();
-      
-      return acl;
-    } catch (Throwable t) {
-      throw new CalFacadeException(t);
@@ -224 +204 @@
-    while (it.hasNext()) {
-      BwShareableDbentity sdbe = (BwShareableDbentity)it.next();
-accessible(sdbe, desiredAccess, nullForNoAccess)
+checkAccess(sdbe, desiredAccess, nullForNoAccess).accessAllowed
-        out.add(sdbe);
-      }
@@ -232 +212 @@
-  }
-
-  /* Check access for the given entity. Returns the character representation of
-   * the ace array.
-   */
-  boolean accessible(BwShareableDbentity ent, int desiredAccess,
-                    boolean nullForNoAccess) throws CalFacadeException {
-    return checkAccess(ent, desiredAccess, nullForNoAccess).accessAllowed;
-  }
-
-  /* Check access for the given entity. Returns the current access
-   */
-  CurrentAccess checkAccess(BwShareableDbentity ent, int desiredAccess,
-nullForNoAccess
+returnResult
-    if (ent == null) {
-
-
-
-
-
-
-
-
-
+
-    }
-
@@ -263 +227 @@
-    }
-
-    char[] aclChars = getAclChars((BwShareableDbentity)ent);
-
-    return checkAccess(aclChars, ent.getOwner(), desiredAccess,
-                    nullForNoAccess);
-  }
-
-  /** This does access checking for shareable objects and returns the merged
-   * list of ace objects.
-   *
-   * @param ent          BwShareableDbentity object
-   * @param desiredAccess int access we want
-   * @return Collection of merged Ace or null for no access
-   * @throws CalFacadeException
-   */
-  Acl getAces(BwShareableDbentity ent, int desiredAccess)
-          throws CalFacadeException {
-    if (ent == null) {
-      return null;
-    }
-
-    if (debug) {
-      String cname = ent.getClass().getName();
-      getLog().debug("Check access for object " +
-                     cname.substring(cname.lastIndexOf(".") + 1) +
-                     " with id " + ent.getId());
-    }
-
-    char[] aclChars = getAclChars((BwShareableContainedDbentity)ent);
-
-    if ((authUser == null) || !superUser) {
-      // Need to check access
-      checkAccess(aclChars, ent.getOwner(), desiredAccess, false);
-    }
-
-    try {
-      Acl acl = new Acl();
-      acl.decode(aclChars);
-
-      return acl;
-    } catch (Throwable t) {
-      throw new CalFacadeException(t);
-    }
-  }
-
-  /* This does access checking given an acl string and owner.
-   *
-   * XXX Should we save the result of previous checks for a given
-   *      acl string + principal + owner + desiredAccess?
-   *
-   * @param aclChars    char[] defining current acls for object
-   * @param owner       BwUser owner of the object
-   * @param desiredAccess int access we want
-   * @param returnResult  if true we return false for no access else throw
-   *                    an exception
-   * @return CurrentAccess   access + allowed/disallowed
-   */
-  private CurrentAccess checkAccess(char[] aclChars, BwUser owner, int desiredAccess,
-                              boolean returnResult) throws CalFacadeException {
-
-    try {
-      CurrentAccess ca;
+      String account = ent.getOwner().getAccount();
+      
+      char[] aclChars = getAclChars(ent);
+
-      if (desiredAccess == privRead) {
-
-
+
-      } else if (desiredAccess == privWrite) {
-
-
+
-      } else {
-
-
-
-
-
+
+
+
+
+
+
+
+
-      if (!ca.accessAllowed && !returnResult) {
-        throw new CalFacadeAccessException();

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java

@@ -64 +64 @@
-import java.util.Collection;
-import java.util.Iterator;
+import java.util.TreeSet;
-
-/** Class to encapsulate most of what we do with calendars
@@ -204 +205 @@
-    sess.cacheableQuery();
-
-access.checkAccess(sess.getList(), privWrite, tru
+postGet(sess.getList(), privWrit
-  }
-
@@ -226 +227 @@
-    sess.cacheableQuery();
-
-access.checkAccess(sess.getList(), privWrite, noAccessReturnsNull
+postGet(sess.getList(), privWrite
-  }
-
@@ -260 +261 @@
-
-    if (cal != null) {
-
+
+
+
-    }
-
@@ -276 +279 @@
-
-    if (cal != null) {
-
+
+
+
-    }
-
@@ -312 +317 @@
-
-    /* We need write access to the parent */
-accessible
+checkAccess
-
-    /** Is the parent a calendar collection?
@@ -411 +416 @@
-   * ==================================================================== */
-
+  /* Return a Collection of the calendars after checking access
+   *
+   */
+  private Collection postGet(Collection cals, int desiredAccess)
+             throws CalFacadeException {
+    TreeSet out = new TreeSet();
+
+    Iterator it = cals.iterator();
+
+    while (it.hasNext()) {
+      BwCalendar cal = (BwCalendar)it.next();
+      CurrentAccess ca = access.checkAccess(cal, desiredAccess, 
+                                            noAccessReturnsNull);
+      if (ca != null) {
+        //cal.setCurrentAccess(ca);
+        out.add(cal);
+      }
+    }
+
+    return out;
+  }
+
-  /* Returns the cloned (sub)tree of calendars to which user has access
-   *

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java

@@ -54 +54 @@
-package org.bedework.calcore.hibernate;
-
-import edu.rpi.cct.uwcal.access.Acl;
-import edu.rpi.cct.uwcal.access.PrivilegeDefs;
-
@@ -497 +496 @@
-    try {
-      if (sess != null) {
+        if (sess.transactionStarted()) {
+          sess.rollback();
+        }
-        sess.disconnect();
-      }
@@ -692 +694 @@
-    access.changeAccess(ent, aces);
-    sess.saveOrUpdate(ent);
-  }
-
-  public Acl getAcl(BwShareableDbentity ent) throws CalFacadeException {
-    checkOpen();
-    return access.getAcl(ent);
-  }
-

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/HibSession.java

@@ -249 +249 @@
-  }
-
+  /** Return true if we have a transaction started
+   * 
+   * @return boolean
+   */
+  public boolean transactionStarted() {
+    return tx != null;
+  }
+  
-  /** Commit a transaction
-   *

trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java

@@ -86 +86 @@
-import org.apache.log4j.Logger;
-
-import edu.rpi.cct.uwcal.access.Acl;
-
-/** Base Implementation of CalIntf which throws exceptions for most methods.
-*
@@ -378 +376 @@
-  }
-
-  public Acl getAcl(BwShareableDbentity ent) throws CalFacadeException {
-    checkOpen();
-    throw new CalFacadeUnimplementedException();
-  }
-
-  /* ====================================================================
-   *                   Timezones

trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/Calintf.java

@@ -68 +68 @@
-import org.bedework.calfacade.filter.BwFilter;
-import org.bedework.calfacade.ifs.Groups;
-
-import edu.rpi.cct.uwcal.access.Acl;
-
-import java.util.Collection;
@@ -365 +363 @@
-                           Collection aces) throws CalFacadeException;
-
-  /** Return the acl representing the allowed access for the given object. This
-   * may be derived from an object higher up the tree.
-   *
-   * @param ent
-   * @return Acl
-   * @throws CalFacadeException
-   */
-  public Acl getAcl(BwShareableDbentity ent) throws CalFacadeException;
-
-  /* ====================================================================
-   *                   Timezones

trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/EventsI.java

@@ -156 +156 @@
-   * @param cal        CalendarVO object
-   * @param val        String possible name
-of EventVO or null
+ of CoreEventInfo objects
-   * @throws CalFacadeException
-   */

trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java

@@ -289 +289 @@
-      CaldavComponentNode cnode = (CaldavComponentNode)uwnode;
-
-
+Info().getEvent
-
-      if (ev != null) {
@@ -808 +808 @@
-        svci.updateCalendar(cal);
-      } else {
-
+Info().getEvent
-
-        svci.changeAccess(ev, info.aces);
@@ -827 +827 @@
-    try {
-      if (cdUri.isCalendar()) {
-getSvci().getAcl(cdUri.getCal())
+cdUri.getCal().getCurrentAccess().acl
-      } else {
-getSvci().getAcl(((CaldavComponentNode)node).getEvent())
+((CaldavComponentNode)node).getEventInfo().getCurrentAccess().acl
-      }
-

trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavComponentNode.java

@@ -56 +56 @@
-
-import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.svc.EventInfo;
-
-import org.bedework.calsvci.CalSvcI;
@@ -81 +82 @@
-public class CaldavComponentNode extends CaldavBwNode {
-  /* The only event or the master */
-
+
+
-
-  /* Collection of BwEvent for this node
@@ -126 +128 @@
-
-    try {
-
-
+Info
+Info.getEvent()
-        if (events.size() == 1) {
-          this.ical = ical; // Save doing it again
@@ -160 +162 @@
-
-    try {
-
+Info
-        String entityName = cdURI.getEntityName();
-
@@ -181 +183 @@
-          if (events.size() == 1) {
-            /* Non recurring or no overrides */
- = (BwEvent
+Info = (EventInfo
-          } else {
-            /* Find the master */
@@ -187 +189 @@
-            Iterator it = events.iterator();
-            while (it.hasNext()) {
-BwEvent ev = (BwEvent
-
-v
- = ev
+EventInfo ei = (EventInfo
+
+i.getEvent()
+Info = ei
-              }
-            }
-
-
+Info
-              throw new WebdavIntfException("Missing master for " + cdURI);
-            }
@@ -201 +203 @@
-      }
-
-
+
+
+
-        creDate = event.getCreated();
-        lastmodDate = event.getLastmod();
@@ -226 +230 @@
-  /** Returns the only event or the master event for a recurrence
-   *
-BwEvent
+EventInfo
-   * @throws WebdavIntfException
-   */
-BwEvent getEvent
-
-
-
+EventInfo getEventInfo
+
+
+Info
-  }
-
@@ -245 +249 @@
-      if (ical == null) {
-        if (events.size() == 1) {
-
+Info.getEvent()
-        } else {
-          // recurring

trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

@@ -98 +98 @@
-//import org.bedework.mail.MailerIntf;
-
-import edu.rpi.cct.uwcal.access.Acl;
-import edu.rpi.cct.uwcal.resources.Resources;
-
@@ -568 +567 @@
-                           Collection aces) throws CalFacadeException {
-    getCal().changeAccess(ent, aces);
-  }
-
-  public Acl getAcl(BwShareableDbentity ent) throws CalFacadeException {
-    return getCal().getAcl(ent);
-  }
-
@@ -1737 +1732 @@
-  public Collection findEventsByName(BwCalendar cal, String val)
-          throws CalFacadeException {
-getCal().getEventsByName(cal, va
+postProcess(getCal().getEventsByName(cal, val), (BwSubscription)nul
-  }
-

trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java

@@ -82 +82 @@
-import org.bedework.icalendar.IcalCallback;
-
-import edu.rpi.cct.uwcal.access.Acl;
-import edu.rpi.cct.uwcal.resources.Resources;
-
@@ -410 +409 @@
- public abstract void changeAccess(BwShareableDbentity ent, 
-                                   Collection aces) throws CalFacadeException;
-
- /** Return the ace representing the allowed access for the given object. This
-  * may be derived from an object higher up the tree.
-  *
-  * @param ent
-  * @return Acl
-  * @throws CalFacadeException
-  */
- public abstract Acl getAcl(BwShareableDbentity ent) throws CalFacadeException;
-
-  /* ====================================================================
@@ -1243 +1233 @@
-   * a new purpose, which indicates the event is hidden for this user.
-   *
-EventVO
+BwEvent
-   * @return  boolean       false for no such item.
-   * @throws CalFacadeException
@@ -1262 +1252 @@
-   * @param cal        CalendarVO object
-   * @param val        String possible name
-VO
+Info
-   * @throws CalFacadeException
-   */

trunk/calendar3/lib/tlds/bedework.tld

@@ -58 +58 @@
-    <tagclass>org.bedework.webcommon.taglib.EmitCurrentPrivsTag</tagclass>
-    <bodycontent>empty</bodycontent>
-txt
+xml version of current privs
-
-    <attribute>
@@ -84 +84 @@
-    </attribute>
-  </tag>
+
+  <tag>
+    <name>emitAcl</name>
+    <tagclass>org.bedework.webcommon.taglib.EmitAclTag</tagclass>
+    <bodycontent>empty</bodycontent>
+    <info>Emit xml version of acl in a tag</info>
+
+    <attribute>
+      <name>name</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+
+    <attribute>
+      <name>property</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+
+    <attribute>
+      <name>scope</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
-</taglib>
-

trunk/calendar3/webclient/war/docs/calendar/emitCalendar.jsp

@@ -11 +11 @@
-  <bw:emitText name="calendar" property="mailListId" />
-  <bw:emitCurrentPrivs name="calendar" property="currentAccess" />
+  <bw:emitAcl name="calendar" property="currentAccess" />
-
-  <logic:iterate name="calendar" property="children" id="cal">

trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java

@@ -468 +468 @@
-         */
-
-request.getParameter(
+getReqPar(request, 
-        if (reqpar == null) {
-          // Make them do it again.
@@ -591 +591 @@
-
-    BwAdminGroup ag = (BwAdminGroup)adgrps.findGroup(groupName);
+    if (ag != null) {
+      adgrps.getMembers(ag);
+    }
-
-    if (debug) {
@@ -933 +936 @@
-        par.svlt = servlet;
-        par.req = request;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          }
-        } catch (Throwable t) {
-          form.getErr().emit("org.bedework.client.error.exc", t.getMessage());
-          form.getErr().emit(t);
-          return false;
-        }
-      } catch (CalFacadeException cfe) {