juergen     2003/07/21 01:05:40

  Modified:    src/share/org/apache/slide/lock LockImpl.java
  Log:
  changed the computeSubjectUriFromPrincipal (Josef)
  
  Revision  Changes    Path
  1.31      +9 -8      jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java
  
  Index: LockImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- LockImpl.java     16 Jul 2003 15:50:41 -0000      1.30
  +++ LockImpl.java     21 Jul 2003 08:05:39 -0000      1.31
  @@ -80,7 +80,6 @@
   import org.apache.slide.structure.ObjectNotFoundException;
   import org.apache.slide.structure.SubjectNode;
   import org.apache.slide.util.Configuration;
  -import org.apache.slide.webdav.util.AclConstants;
   
   /**
    * Lock helper class.
  @@ -409,21 +408,22 @@
       private String computeSubjectUriFromPrincipal(SlideToken token) {
   
           String result;
  -        String configParam = 
namespaceConfig.getParameter(AclConstants.P_USER_COLLECTION);
  +        String configParam = namespaceConfig.getParameter("user_collection");
   
           String userCollection;
           if ( configParam != null && configParam.length() > 0) {
               userCollection =  "/" + configParam;
           } else {
  -            userCollection =  "";
  +            userCollection =  "/";
           }
   
   
           String userId = token.getCredentialsToken().getPublicCredentials();
           if (userId.equals("/")) userId = "";
  +             else userId = "/" + userId;
   
           result = namespaceConfig.getUsersPath() + userCollection + userId;
  -        System.out.println("##### Subject URI = " + result);
  +//        System.out.println("##### Subject URI = " + result);
           return result;
       }
   
  @@ -749,6 +749,7 @@
       }
   
   }
  +
   
   
   
  
  
  

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

Reply via email to