luetzkendorf    2005/01/21 10:17:50

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        PropPatchMethod.java
  Log:
  new parameter no-versioning-for-proppatch (part two)
  
  Revision  Changes    Path
  1.92      +5 -1      
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java
  
  Index: PropPatchMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- PropPatchMethod.java      19 Jan 2005 15:21:27 -0000      1.91
  +++ PropPatchMethod.java      21 Jan 2005 18:17:50 -0000      1.92
  @@ -604,7 +604,8 @@
                       !E_CHECKOUT_UNLOCKED_CHECKIN.equals(autoVersion) &&
                       !E_CHECKOUT.equals(autoVersion) &&
                       !E_CHECKOUT_IGNORE_UNLOCK.equals(autoVersion) &&
  -                    !E_LOCKED_CHECKOUT.equals(autoVersion) ) {
  +                    !E_LOCKED_CHECKOUT.equals(autoVersion) &&
  +                    !notVersionForPropPatch(token.getUri(slideToken, 
resourcePath))) {
                       return new 
ViolatedPrecondition(C_CANNOT_MODIFY_VERSION_CONTROLLED_PROPERTY,
                                                       
WebdavStatus.SC_FORBIDDEN);
                   }
  @@ -716,6 +717,9 @@
           }
       }
       
  +    /**
  +     * <code>true</code> if unversioned PROPPATCH is allowed 
  +     */
       private static boolean notVersionForPropPatch(Uri resource) {
           return 
Boolean.valueOf(Domain.getParameter("no-versioning-for-proppatch", 
                   "false", resource.getStore())).booleanValue();
  
  
  

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

Reply via email to