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 11:06:53 UTC

cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method LockMethod.java

juergen     2003/08/05 02:06:53

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        LockMethod.java
  Log:
  added support for extern ACL_Semantic (eckehard)
  
  Revision  Changes    Path
  1.47      +11 -4     jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java
  
  Index: LockMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- LockMethod.java	17 Jun 2003 14:17:59 -0000	1.46
  +++ LockMethod.java	5 Aug 2003 09:06:53 -0000	1.47
  @@ -80,6 +80,7 @@
   import org.apache.slide.security.AccessDeniedException;
   import org.apache.slide.structure.*;
   
  +import org.apache.slide.webdav.util.AclConstants;
   import org.apache.slide.webdav.util.PropertyHelper;
   import org.apache.slide.webdav.util.XMLValue;
   
  @@ -464,10 +465,16 @@
                                                   + (MAX_TIMEOUT * 1000));
   
                       }
  +                    String userCollection = "/";
  +                    String configParam = namespaceConfig.getParameter(AclConstants.P_USER_COLLECTION);
  +                    if ( configParam != null ) {
  +                    if ( configParam.length() > 0 )
  +                        userCollection = "/" + configParam +"/";
  +                    }
   
                       SubjectNode credentialsSubject =
                           (SubjectNode) structure.retrieve
  -                        (slideToken, namespaceConfig.getUsersPath() + "/"
  +                        (slideToken, namespaceConfig.getUsersPath() + userCollection
                                + slideToken.getCredentialsToken()
                                .getPublicCredentials());
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org