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

[juergen]

juergen     2003/08/08 08:27:25

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        PropertyHelper.java
  Log:
  fixed def. owner (eckehard)
  
  Revision  Changes    Path
  1.48      +11 -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.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- PropertyHelper.java       8 Aug 2003 05:58:18 -0000       1.47
  +++ PropertyHelper.java       8 Aug 2003 15:27:24 -0000       1.48
  @@ -120,6 +120,8 @@
       public final static String LOCKDISCOVERY_INCL_PRINCIPAL =
           "lockdiscoveryIncludesPrincipalURL";
   
  +    private final static String USER_COLLECTION = "user_collection";
  +    
       private boolean lockdiscoveryIncludesPrincipalURL = true;
   
       /**
  @@ -1983,12 +1985,16 @@
                                                                       
NodeProperty.DEFAULT_NAMESPACE);
           String ownerHref;
           NamespaceConfig config = nsaToken.getNamespaceConfig();
  -        
  +        String userCollection = config.getParameter(USER_COLLECTION);
           if ((ownerProperty != null) && (ownerProperty.getValue()!=null) &&
                   (!"".equals(ownerProperty.getValue().toString()))) {
  +            
  +            if (userCollection == null){
               ownerHref = contextPath + config.getUsersPath() + "/" + 
ownerProperty.getValue().toString();
  +            } else {
  +                ownerHref = contextPath + config.getUsersPath() + "/" + 
userCollection + "/" + ownerProperty.getValue().toString();
           }
  -        else {
  +        } else {
               ownerHref =  contextPath + config.getUsersPath();
                        if ( config.getGuestPath() != null && 
!config.getGuestPath().equals("") )
                                ownerHref = ownerHref + "/" + config.getGuestPath();
  
  
  

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