You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2003/08/05 10:56:16 UTC

cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util AclConstants.java

juergen     2003/08/05 01:56:16

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        AclConstants.java
  Log:
  fixed bug in Report (eckehard)
  
  Revision  Changes    Path
  1.15      +14 -4     jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AclConstants.java
  
  Index: AclConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AclConstants.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AclConstants.java	14 Feb 2003 14:34:36 -0000	1.14
  +++ AclConstants.java	5 Aug 2003 08:56:16 -0000	1.15
  @@ -91,6 +91,12 @@
       static String P_ACL_SEMANTICS                   = "acl-semantics";
       static String P_PRINCIPAL_COLLECTION_SET        = "principal-collection-set";
       static String P_ACE                             = "ace";
  +    static String P_USER_COLLECTION                 = "user_collection";
  +	static String P_GROUP_COLLECTION                = "group_collection";
  +	static String P_ROLE_COLLECTION                 = "role_collection";
  +    static String P_PRINCIPAL_URL                   = "principal-URL";
  +    static String P_GROUP_MEMBERSHIP                = "group-membership";
  +	static String P_GROUP_MEMBER_SET                = "group-member-set";
   
       String[] ACL_PROPERTIES = new String[] {
           P_ALTERNATE_URI_SET,
  @@ -160,12 +166,14 @@
       
   
       /** Constant helpers */
  +    static String C_HREF_OPEN                       = "<D:href>";
  +    static String C_HREF_CLOSE                       = "</D:href>";
       static String C_SEARCHREQUEST_OPEN              = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><searchrequest xmlns:D=\"DAV:\"><D:basicsearch>";
       static String C_SEARCHREQUEST_CLOSE             = "</D:basicsearch></searchrequest>";
       static String C_SELECT_OPEN                     = "<D:select>";
       static String C_SELECT_CLOSE                    = "</D:select>";
       static String C_WHERE_ISPRINCIPAL               = "<D:where><" + Literals.ISPRINCIPAL + " xmlns=\"" + NamespaceCache.SLIDE_URI + "\"/></D:where>";
  -    static String C_PROP_DISPLAYNAME                = "<D:prop><D:displayname/></D:prop>";
  +    static String C_PROP_PRINCIPAL_URL               = "<D:prop><D:href><D:principal-URL/></D:href></D:prop>";
       static String C_LITERAL_OPEN                    = "<D:literal>";
       static String C_LITERAL_CLOSE                   = "</D:literal>";
       static String C_PROP_OPEN                       = "<D:prop>";
  @@ -179,6 +187,7 @@
       static String C_WHERE_CLOSE                     = "</D:and></D:where>";
       static String C_FROM_SCOPE_OPEN                 = "<D:from><D:scope><D:href>";
       static String C_FROM_SCOPE_CLOSE                = "</D:href></D:scope></D:from>";
  +    static String C_DISPLAYNAME                     = "displayname";
   
       
       /* The PRINCIPAL-SEARCH-PROPERTY-SET has to be in the following way:
  @@ -189,6 +198,7 @@
       static String C_SEARCH_PROPERTY_SET_SEPERATOR   = "/";
   
   }
  +