juergen     2002/06/06 01:16:49

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        AclMethod.java
  Log:
  inheritence behavior of ACL Method has not been standard conform changed it to the 
standard (Eckehard)
  
  Revision  Changes    Path
  1.22      +14 -14    
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java
  
  Index: AclMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- AclMethod.java    28 May 2002 12:39:40 -0000      1.21
  +++ AclMethod.java    6 Jun 2002 08:16:49 -0000       1.22
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java,v
 1.21 2002/05/28 12:39:40 juergen Exp $
  - * $Revision: 1.21 $
  - * $Date: 2002/05/28 12:39:40 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java,v
 1.22 2002/06/06 08:16:49 juergen Exp $
  + * $Revision: 1.22 $
  + * $Date: 2002/06/06 08:16:49 $
    *
    * ====================================================================
    *
  @@ -199,18 +199,18 @@
                       Element ace = (Element) aceIterator.next();
                       
                       // inherited permissions
  -                    List inheritedList = ace.getChildren(E_INHERITED,
  -                                                         
NamespaceCache.DEFAULT_NAMESPACE);
  -                    int inheritedCount = inheritedList.size();
  -                    if (inheritedCount == 1) {
  -                        Element inheritedElement = (Element) inheritedList.get(0);
  -                        String inherited = parseInheritence(inheritedElement);
  -                        if (inherited.equalsIgnoreCase("false")) inheritable = 
false;
  +//                    List inheritedList = ace.getChildren(E_INHERITED,
  +//                                                         
NamespaceCache.DEFAULT_NAMESPACE);
  +//                    int inheritedCount = inheritedList.size();
  +//                    if (inheritedCount == 1) {
  +//                        Element inheritedElement = (Element) inheritedList.get(0);
  +//                        String inherited = parseInheritence(inheritedElement);
  +//                        if (inherited.equalsIgnoreCase("false")) inheritable = 
false;
                           //                         continue;
  -                    }
  -                    if (inheritedCount > 1) {
  -                    throw new JDOMException("Element <"+E_ACE+"> must contain 
at most one <"+E_INHERITED+"> element");
  -                    }
  +//                    }
  +//                    if (inheritedCount > 1) {
  +//                    throw new JDOMException("Element <"+E_ACE+"> must 
contain at most one <"+E_INHERITED+"> element");
  +//                    }
                       
                       // Ignore protected (protected <-> inherited for Slide)
                       int protectedCount = ace.getChildren(E_PROTECTED,
  
  
  

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

Reply via email to