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

[dirkv]

dirkv       01/07/13 03:51:42

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        PropFindMethod.java
  Log:
  read-locks privilege is a read privilege
  
  Revision  Changes    Path
  1.28      +11 -11    
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
  
  Index: PropFindMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- PropFindMethod.java       2001/07/12 12:13:27     1.27
  +++ PropFindMethod.java       2001/07/13 10:51:31     1.28
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
 1.27 2001/07/12 12:13:27 juergen Exp $
  - * $Revision: 1.27 $
  - * $Date: 2001/07/12 12:13:27 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
 1.28 2001/07/13 10:51:31 dirkv Exp $
  + * $Revision: 1.28 $
  + * $Date: 2001/07/13 10:51:31 $
    *
    * ====================================================================
    *
  @@ -1316,13 +1316,14 @@
                       
                       // read
                       boolean isReadObject = readObjectUri.startsWith(action);
  -                    boolean isReadRevisionMetadata =
  +                    boolean isReadLocks = readLocksUri.startsWith(action);
  +                    boolean isReadRevisionMetadata = 
                           readRevisionMetadataUri.startsWith(action);
                       boolean isReadRevisionContent =
                           readRevisionContentUri.startsWith(action);
                       
  -                    boolean isRead = isReadObject && isReadRevisionMetadata
  -                        && isReadRevisionContent;
  +                    boolean isRead = isReadObject && isReadLocks
  +                                             && isReadRevisionMetadata && 
isReadRevisionContent;
                       
                       // write
                       boolean isCreateObject =
  @@ -1330,7 +1331,6 @@
                       boolean isRemoveObject =
                           removeObjectUri.startsWith(action);
                       boolean isLockObject = lockObjectUri.startsWith(action);
  -                    boolean isReadLocks = readLocksUri.startsWith(action);
                       boolean isCreateRevisionMetadata =
                           createRevisionMetadataUri.startsWith(action);
                       boolean isModifyRevisionMetadata =
  @@ -1345,7 +1345,7 @@
                           removeRevisionContentUri.startsWith(action);
                       
                       boolean isWrite = isCreateObject && isRemoveObject
  -                        && isLockObject && isReadLocks 
  +                        && isLockObject
                           && isCreateRevisionMetadata
                           && isModifyRevisionMetadata && isRemoveRevisionMetadata
                           && isCreateRevisionContent && isModifyRevisionContent 
  @@ -1390,6 +1390,9 @@
                               if (isReadObject)
                                   writePrivilege(generatedXML, 
                                                  "read-object", false);
  +                            if (isReadLocks)
  +                                writePrivilege(generatedXML, 
  +                                               "read-locks", false);
                               if (isReadRevisionMetadata)
                                   writePrivilege(generatedXML, 
                                                  "read-revision-metadata", 
  @@ -1410,9 +1413,6 @@
                               if (isLockObject)
                                   writePrivilege(generatedXML,
                                                  "lock-object", false);
  -                            if (isReadLocks)
  -                                writePrivilege(generatedXML,
  -                                               "read-locks", false);
                               if (isCreateRevisionMetadata)
                                   writePrivilege(generatedXML, 
                                                  "create-revision-metadata",