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

[juergen]

juergen     2003/08/05 02:10:38

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        PropertyHelper.java
  Log:
  added support for extern ACL_Semantic (eckehard)
  
  Revision  Changes    Path
  1.46      +15 -5     
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
  
  Index: PropertyHelper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- PropertyHelper.java       3 Jun 2003 07:59:08 -0000       1.45
  +++ PropertyHelper.java       5 Aug 2003 09:10:38 -0000       1.46
  @@ -1954,6 +1954,8 @@
       /**
        * Returns an XMLValue containing the value of the
        * <code>&lt;owner&gt;</code> property.
  +     * The XMLValue is comupted of userspath + user_collection + owner.
  +     * The userspath and the user_prefix properties are set in the Domain.xml file.
        *
        * @param    revisionDescriptors  the NodeRevisionDescriptors of the resource.
        * @param    revisionDescriptor   the NodeRevisionDescriptor of the resource.
  @@ -1981,12 +1983,20 @@
                                                                       
NodeProperty.DEFAULT_NAMESPACE);
           String ownerHref;
           NamespaceConfig config = nsaToken.getNamespaceConfig();
  +        
  +        String userCollection = "/";
  +        String configParam = config.getParameter(AclConstants.P_USER_COLLECTION);
  +        if ( configParam != null ) {
  +            if ( configParam.length() > 0 )
  +                userCollection = "/" + configParam +"/";
  +        }
  +        
           if ((ownerProperty != null) && (ownerProperty.getValue()!=null) &&
                   (!"".equals(ownerProperty.getValue().toString()))) {
  -            ownerHref = contextPath + config.getUsersPath() + "/" + 
ownerProperty.getValue().toString();
  +            ownerHref = contextPath + config.getUsersPath() + userCollection + 
ownerProperty.getValue().toString();
           }
           else {
  -            ownerHref =  contextPath + config.getUsersPath() + "/" + 
config.getGuestPath();
  +            ownerHref =  contextPath + config.getUsersPath() + userCollection + 
config.getGuestPath();
           }
           Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
           href.setText(ownerHref);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]