cvs commit: jahia/src/java/org/apache/slide/macro MacroImpl.java

[Thomas Draier]

tdraier     2004/11/19 17:01:46 CET

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/apache/slide/macro MacroImpl.java 
  Log:
  fixed acl problem with file copy (was copying negative rights as positive)
  
  Revision  Changes    Path
  1.3.4.3   +6 -5      jahia/src/java/org/apache/slide/macro/MacroImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/apache/slide/macro/MacroImpl.java.diff?r1=1.3.4.2&r2=1.3.4.3&f=h
  
  
  
  Index: MacroImpl.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/apache/slide/macro/Attic/MacroImpl.java,v
  retrieving revision 1.3.4.2
  retrieving revision 1.3.4.3
  diff -u -r1.3.4.2 -r1.3.4.3
  --- MacroImpl.java    28 May 2004 15:33:05 -0000      1.3.4.2
  +++ MacroImpl.java    19 Nov 2004 16:01:46 -0000      1.3.4.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/repository/jahia/src/java/org/apache/slide/macro/Attic/MacroImpl.java,v
 1.3.4.2 2004/05/28 15:33:05 shuber Exp $
  - * $Revision: 1.3.4.2 $
  - * $Date: 2004/05/28 15:33:05 $
  + * $Header: 
/home/cvs/repository/jahia/src/java/org/apache/slide/macro/Attic/MacroImpl.java,v
 1.3.4.3 2004/11/19 16:01:46 tdraier Exp $
  + * $Revision: 1.3.4.3 $
  + * $Date: 2004/11/19 16:01:46 $
    *
    * ====================================================================
    *
  @@ -88,7 +88,7 @@
    * Macro helper class.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
  - * @version $Revision: 1.3.4.2 $
  + * @version $Revision: 1.3.4.3 $
    */
   public final class MacroImpl implements Macro {
   
  @@ -349,7 +349,8 @@
                           new NodePermission(destinationUri,
                                              permission.getSubjectUri(),
                                              permission.getActionUri(),
  -                                           permission.isInheritable());
  +                                           permission.isInheritable(),
  +                                           permission.isNegative());
                       securityHelper.grantPermission(token, newPermission);
                   }