Changeset 833

Timestamp:

07/23/06 22:54:06

Author:

douglm

Message:

Move code out of appcommon into access project.

Files:

• trunk/calendar3/appcommon/src/org/bedework/appcommon/AccessXmlUtil.java (modified) (8 diffs)
• trunk/calendar3/bldfiles/quickstart-build.xml (modified) (3 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java (modified) (3 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/EmitAccess.java (modified) (4 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/common/MethodBase.java (modified) (1 diff)
• trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsIntf.java (modified) (2 diffs)
• trunk/calendar3/davdefs/src/org/bedework/davdefs/WebdavTags.java (modified) (4 diffs)
• trunk/calendar3/lib/rpiaccess-2.0.jar (modified) (previous)
• trunk/calendar3/lib/rpiutil-3.1.jar (modified) (previous)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/EmitAclTag.java (modified) (3 diffs)

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

@@ -54 +54 @@
-package org.bedework.appcommon;
-
-import org.bedework.calfacade.CalFacadeException;
-import org.bedework.davdefs.CaldavTags;
-import org.bedework.davdefs.WebdavTags;
-
-e
+cessException
-import edu.rpi.cmt.access.Acl;
-import edu.rpi.cmt.access.Privilege;
-import edu.rpi.cmt.access.PrivilegeDefs;
-import edu.rpi.cmt.access.PrivilegeSet;
-import edu.rpi.cmt.access.Privileges;
-import edu.rpi.sss.util.xml.QName;
-import edu.rpi.sss.util.xml.XmlEmit;
-
-import java.io.Serializable;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Iterator;
-
-/** Class to generate xml from an access specification. The resulting xml follows
@@ -77 +70 @@
- *  @author Mike Douglass   douglm @ rpi.edu
- */
-implements Serializable
+extends edu.rpi.cmt.access.AccessXmlUtil
-  /** xml rpivilege tags */
-ublic
+rivate
-    WebdavTags.all,              // privAll = 0;
-    WebdavTags.read,             // privRead = 1;
@@ -95 +88 @@
-  };
-
-  private XmlEmit xml;
-
-  /** Acls use tags in the webdav and caldav namespace.
-   *
@@ -102 +93 @@
-   */
-  public AccessXmlUtil(XmlEmit xml) {
-this.xml = xml
+super(privTags, new WebdavTags(), xml)
-  }
-
@@ -109 +100 @@
-   * @param acl
-   * @return String xml representation
-CalFacade
+Access
-   */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  }
-
@@ -228 +112 @@
-   * @param xml
-   * @param privileges    char[] of allowed/disallowed
-CalFacade
+Access
-   */
-  public static void emitCurrentPrivSet(XmlEmit xml,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  }
-
@@ -259 +127 @@
-   * @param ps    PrivilegeSet allowed/disallowed
-   * @return String xml
-CalFacade
+Access
-   */
-  public static String getCurrentPrivSetString(PrivilegeSet ps)
-CalFacade
+Access
-    try {
-      char[] privileges = ps.getPrivileges();
@@ -269 +137 @@
-      StringWriter su = new StringWriter();
-      xml.startEmit(su);
-
+
+
+
-
-      su.close();
-
-      return su.toString();
-CalFacadeException cf
-cf
+AccessException a
+a
-    } catch (Throwable t) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-  }

trunk/calendar3/bldfiles/quickstart-build.xml

@@ -150 +150 @@
-    <ant antfile="${org.bedework.project.rpiutil}/build.xml" inheritrefs="true"
-           target="build-all" />
+
-    <copy todir="${org.bedework.project.calendar}/lib" overwrite="yes">
-      <fileset dir="${org.bedework.project.rpiutil}/dist">
@@ -155 +156 @@
-      </fileset>
-    </copy>
+
+    <copy todir="${org.bedework.project.access}/lib" overwrite="yes">
+      <fileset dir="${org.bedework.project.rpiutil}/dist">
+        <include name="*.jar" />
+      </fileset>
+    </copy>
-  </target>
-
@@ -161 +168 @@
-    <ant antfile="${org.bedework.project.rpiutil}/build.xml" inheritrefs="true"
-           target="clean-build-all" />
+
-    <copy todir="${org.bedework.project.calendar}/lib" overwrite="yes">
+      <fileset dir="${org.bedework.project.rpiutil}/dist">
+        <include name="*.jar" />
+      </fileset>
+    </copy>
+
+    <copy todir="${org.bedework.project.access}/lib" overwrite="yes">
-      <fileset dir="${org.bedework.project.rpiutil}/dist">
-        <include name="*.jar" />

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

@@ -768 +768 @@
-    int priv;
-
+    QName[] privTags = emitAccess.getPrivTags();
+
-    findPriv: {
-      // ENUM
-AccessXmlUtil.
-AccessXmlUtil.
+
+
-          break findPriv;
-        }
@@ -826 +828 @@
-    }
-  }
-
-  /*
-  public void emitAcl(WebdavNsNode node) throws WebdavIntfException {
-    CaldavBwNode uwnode = getBwnode(node);
-    CaldavURI cdUri = uwnode.getCDURI();
-    Collection aces = null;
-
-    try {
-      if (cdUri.isCalendar()) {
-        aces = getSvci().getAces(cdUri.getCal());
-      } else {
-        aces = getSvci().getAces(((CaldavComponentNode)node).getEvent());
-      }
-
-      xml.openTag(WebdavTags.acl);
-
-      if (aces != null) {
-        Iterator it = aces.iterator();
-        while (it.hasNext()) {
-          Ace ace = (Ace)it.next();
-
-          emitAce(ace, true);
-          emitAce(ace, false);
-        }
-      }
-      xml.closeTag(WebdavTags.acl);
-    } catch (WebdavIntfException wi) {
-      throw wi;
-    } catch (Throwable t) {
-      throw new WebdavIntfException(t);
-    }
-  }
-
-  private void emitAce(Ace ace, boolean denials) throws Throwable {
-    Collection privs = ace.getPrivs();
-    boolean emittedWho = false;
-
-    QName tag;
-    if (denials) {
-      tag = WebdavTags.deny;
-    } else {
-      tag = WebdavTags.grant;
-    }
-
-    Iterator it = privs.iterator();
-    while (it.hasNext()) {
-      Privilege p = (Privilege)it.next();
-
-      if (denials == p.getDenial()) {
-        if (!emittedWho) {
-          emitAceWho(ace);
-          emittedWho = true;
-        }
-
-        xml.openTag(tag);
-        xml.emptyTag(privTags[p.getIndex()]);
-        xml.closeTag(tag);
-      }
-    }
-
-    if (emittedWho) {
-      xml.closeTag(WebdavTags.ace);
-    }
-  }
-
-  private void emitAceWho(Ace ace) throws Throwable {
-    xml.openTag(WebdavTags.ace);
-
-    boolean invert = ace.getNotWho();
-
-    if (ace.getWhoType() == Ace.whoTypeOther) {
-      invert = !invert;
-    }
-
-    if (invert) {
-      xml.openTag(WebdavTags.invert);
-    }
-
-    xml.openTag(WebdavTags.principal);
-
-    int whoType = ace.getWhoType();
-
-    /*
-           <!ELEMENT principal (href)
-                  | all | authenticated | unauthenticated
-                  | property | self)>
-    * /
-
-    if (whoType == Ace.whoTypeUser) {
-      xml.property(WebdavTags.href, makeUserHref(ace.getWho()));
-    } else if (whoType == Ace.whoTypeGroup) {
-      xml.property(WebdavTags.href, makeGroupHref(ace.getWho()));
-    } else if ((whoType == Ace.whoTypeOwner) ||
-               (whoType == Ace.whoTypeOther)) {
-      // Other is !owner
-      xml.openTag(WebdavTags.property);
-      xml.emptyTag(WebdavTags.owner);
-      xml.closeTag(WebdavTags.property);
-    } else if (whoType == Ace.whoTypeUnauthenticated) {
-      xml.emptyTag(WebdavTags.unauthenticated);
-    } else if (whoType == Ace.whoTypeAuthenticated) {
-      xml.emptyTag(WebdavTags.authenticated);
-    } else if (whoType == Ace.whoTypeAll) {
-      xml.emptyTag(WebdavTags.all);
-    } else  {
-      throw WebdavIntfException.serverError();
-    }
-
-    xml.closeTag(WebdavTags.principal);
-
-    if (invert) {
-      xml.closeTag(WebdavTags.invert);
-    }
-  }
-  */
-
-  /** This class is the result of interpreting a principal url
@@ -987 +874 @@
-      throw WebdavIntfException.badRequest();
-    }
+  }
+
+  /** Override to include free and busy access.
+   *
+   * @return QName[]
+   */
+  public QName[] getPrivTags() {
+    return emitAccess.getPrivTags();
-  }
-

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

@@ -54 +54 @@
-package edu.rpi.cct.uwcal.caldav;
-
-
+
+
-
+import edu.rpi.cmt.access.AccessXmlUtil;
+import edu.rpi.sss.util.xml.QName;
-import edu.rpi.sss.util.xml.XmlEmit;
-
@@ -65 +68 @@
-  private String namespacePrefix;
-
+  /** xml rpivilege tags */
+  private static final QName[] privTags = {
+    WebdavTags.all,              // privAll = 0;
+    WebdavTags.read,             // privRead = 1;
+    WebdavTags.readAcl,          // privReadAcl = 2;
+    WebdavTags.readCurrentUserPrivilegeSet,  // privReadCurrentUserPrivilegeSet = 3;
+    CaldavTags.readFreeBusy,     // privReadFreeBusy = 4;
+    WebdavTags.write,            // privWrite = 5;
+    WebdavTags.writeAcl,         // privWriteAcl = 6;
+    WebdavTags.writeProperties,  // privWriteProperties = 7;
+    WebdavTags.writeContent,     // privWriteContent = 8;
+    WebdavTags.bind,             // privBind = 9;
+    WebdavTags.unbind,           // privUnbind = 10;
+    WebdavTags.unlock,           // privUnlock = 11;
+    null                         // privNone = 12;
+  };
+
-  /** Acls use tags in the webdav and caldav namespace. For use over caldav
-   * we shoud supply the uris. Otherwise a null namespace will be used.
@@ -72 +92 @@
-   */
-  public EmitAccess(String namespacePrefix, XmlEmit xml) {
-
+privTags, new WebdavTags(), 
-
-    this.namespacePrefix = namespacePrefix;
@@ -94 +114 @@
-    return namespacePrefix + "/principals/groups/" + who;
-  }
+
+  /**
+   * @return QName[]
+   */
+  public QName[] getPrivTags() {
+    return privTags;
+  }
-}

trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/common/MethodBase.java

@@ -531 +531 @@
-  protected void startEmit(HttpServletResponse resp) throws WebdavException {
-    try {
-
+.getWriter()
-    } catch (Throwable t) {
-      throw new WebdavException(t);

trunk/calendar3/caldav/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsIntf.java

@@ -681 +681 @@
-
-          openPropstat();
-
+
+
-          closePropstat();
-        }
@@ -762 +763 @@
-  }
-
+  /** xml rpivilege tags */
+  private static final QName[] privTags = {
+    WebdavTags.all,              // privAll = 0;
+    WebdavTags.read,             // privRead = 1;
+    WebdavTags.readAcl,          // privReadAcl = 2;
+    WebdavTags.readCurrentUserPrivilegeSet,  // privReadCurrentUserPrivilegeSet = 3;
+    null,                        // privReadFreeBusy = 4;
+    WebdavTags.write,            // privWrite = 5;
+    WebdavTags.writeAcl,         // privWriteAcl = 6;
+    WebdavTags.writeProperties,  // privWriteProperties = 7;
+    WebdavTags.writeContent,     // privWriteContent = 8;
+    WebdavTags.bind,             // privBind = 9;
+    WebdavTags.unbind,           // privUnbind = 10;
+    WebdavTags.unlock,           // privUnlock = 11;
+    null                         // privNone = 12;
+  };
+
+  /**
+   * @return QName[]
+   */
+  public QName[] getPrivTags() {
+    return privTags;
+  }
+
-  /* ====================================================================
-   *                   XmlUtil wrappers

trunk/calendar3/davdefs/src/org/bedework/davdefs/WebdavTags.java

@@ -1 @@
-/*
- Copyright (c) 2000-2005 University of Washington.  All rights reserved.
-
- Redistribution and use of this distribution in source and binary forms,
- with or without modification, are permitted provided that:
-
-   The above copyright notice and this permission notice appear in
-   all copies and supporting documentation;
-
-   The name, identifiers, and trademarks of the University of Washington
-   are not used in advertising or publicity without the express prior
-   written permission of the University of Washington;
-
-   Recipients acknowledge that this distribution is made available as a
-   research courtesy, "as is", potentially with defects, without
-   any obligation on the part of the University of Washington to
-   provide support, services, or repair;
-
-   THE UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR
-   IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION
-   ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-   PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF
-   WASHINGTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-   DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-   PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT (INCLUDING
-   NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION WITH
-   THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-/* **********************************************************************
-    Copyright 2005 Rensselaer Polytechnic Institute. All worldwide rights reserved.
@@ -54 +26 @@
-package org.bedework.davdefs;
-
+import edu.rpi.cmt.access.AccessXmlUtil.AccessTags;
+
-import edu.rpi.sss.util.xml.QName;
+
+import java.util.HashMap;
-
-/** Define Webdav tags for XMlEmit
@@ -60 +36 @@
- * @author Mike Douglass douglm@rpi.edu
- */
-
+implements AccessTags 
-  /** Namespace for these tags
-   */
@@ -66 +42 @@
-
-  /** */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                "read-current-user-privilege-set");
-
-  /** */
-new QName(namespace,
-
-
-/** */
-
-
-/** */
-
-                                                   "required-principal");
-
-
-public static final QName resource = new QName(namespace,
-                                               "resourc
-
-
-ourcetype = new QName(namespace,
-
-
-/** */
-
-
-/** */
-
-                                                    "responsedescription");
-
-
-public static final QName self = new QName(namespace, "self");
-
-
-public static final QName set = new QName(namespace, "set");
-
-
-public static final QName source = new QName(namespace, "source");
-
-
-public static final QName status = new QName(namespace, "status");
-
-
-public static final QName supportedPrivilege = new QName(namespace,
-                                                      "supported-privilege
-
-
-supportedPrivilegeSet = new QName(namespace,
-
-
-/** */
-
-                                                "supportedlock");
-
-
-public static final QName unauthenticated = new QName(namespace,
-                                                      "unauthenticated
-
-
-unbind = new QName(namespace,
-
-
-/** */
-
-                                             "unlock");
-
-
-public static final QName write = new QName(namespace,
-                                           "write");
-
-
-ublic static final QName writeAcl = new QName(namespace,
-                                             "write-acl"
-
-
-public static final QName writeContent = new QName(namespace,
-                                               "write-content");
-
-/** */
-public static final QName writeProperties = new QName(namespace,
-                                               "write-properties");
+makeQName("recognized-principal");
+
+
+public static final QName remove = makeQName("remove");
+
+
+public static final QName requiredPrincipal = makeQName("required-principal");
+
+/** */
+
+
+/** */
+public static final QName resourcetype = makeQName("resourcetyp
+
+
+ponse = makeQName("response");
+
+
+public static final QName responseDescription = makeQName("responsedescription");
+
+
+public static final QName self = makeQName("self");
+
+/** */
+
+
+/** */
+
+
+/** */
+
+
+/** */
+
+
+/** */
+
+
+/** */
+public static final QName supportedlock = makeQName("supportedlock
+
+
+unauthenticated = makeQName("unauthenticated");
+
+
+public static final QName unbind = makeQName("unbind");
+
+/** */
+
+
+/** */
+public static final QName write = makeQName("write
+
+
+writeAcl = makeQName("write-acl");
+
+
+public static final QName writeContent = makeQName("write-content");
+
+/** */
+
+
+/** Tables of QNames indexed by name
+*/
+
+
+rivate static QName makeQName(String name) {
+QName q = new QName(namespace, name
+
+
+  return q;
+}
+
+public QName getTag(String name) {
+  return (QName)qnames.get(name);
+}
-}
-

trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/EmitAclTag.java

@@ -54 +54 @@
-package org.bedework.webcommon.taglib;
-
-
-import org.bedework.appcommon.AccessXmlUtil;
-
@@ -78 +77 @@
-  public EmitAclTag() {
-  }
-
+
-  /** Called at end of Tag
-   *
@@ -100 +99 @@
-    return EVAL_PAGE;
-  }
-
+
-  private String getXmlAcl(CurrentAccess ca) throws Throwable {
-    if (ca == null) {
-      return null;
-    }
-
+
-    return AccessXmlUtil.getXmlAclString(ca.acl);
-  }