You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2001/05/16 14:03:23 UTC

cvs commit: jakarta-slide/src/manager/org/apache/slide/manager ManagerServlet.java

juergen     01/05/16 05:03:23

  Modified:    src/manager/org/apache/slide/manager ManagerServlet.java
  Log:
  removed the NRD from the API, to be put in NodePermission, see e-mails.
  
  Revision  Changes    Path
  1.6       +4 -10     jakarta-slide/src/manager/org/apache/slide/manager/ManagerServlet.java
  
  Index: ManagerServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/manager/org/apache/slide/manager/ManagerServlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ManagerServlet.java	2001/05/10 18:36:09	1.5
  +++ ManagerServlet.java	2001/05/16 12:03:18	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/manager/org/apache/slide/manager/ManagerServlet.java,v 1.5 2001/05/10 18:36:09 juergen Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/05/10 18:36:09 $
  + * $Header: /home/cvs/jakarta-slide/src/manager/org/apache/slide/manager/ManagerServlet.java,v 1.6 2001/05/16 12:03:18 juergen Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/05/16 12:03:18 $
    *
    * ====================================================================
    *
  @@ -81,7 +81,7 @@
   import org.apache.slide.security.*;
   import org.apache.slide.util.conf.*;
   import org.apache.slide.authenticate.SecurityToken;
  -import org.apache.slide.content.NodeRevisionDescriptor;
  +
   /**
    * Manager Servlet.
    *
  @@ -89,12 +89,6 @@
    */
   public class ManagerServlet extends HttpServlet {
       
  -        
  -    
  -    /** private field to indicate, that the versionNumber is not correctly supported yet
  -     **/
  -    private static final NodeRevisionDescriptor dummyNodeRevisionDescriptor = null;
  -
       
       // -------------------------------------------------------------- Constants
       
  @@ -393,7 +387,7 @@
                   nat.getStructureHelper().retrieve(token, subjectUri);
               ActionNode action = (ActionNode)
                   nat.getStructureHelper().retrieve(token, actionUri);
  -            nat.getSecurityHelper().revokePermission(token, object, dummyNodeRevisionDescriptor,
  +            nat.getSecurityHelper().revokePermission(token, object,
                                                        subject, action);
               
           } catch (AccessDeniedException e) {
  @@ -533,10 +527,10 @@
                   SlideToken token = new SlideToken(credToken);
                   if (negative) {
                       nat.getSecurityHelper()
  -                        .denyPermission(token, dummyNodeRevisionDescriptor, permission);
  +                        .denyPermission(token, permission);
                   } else {
                       nat.getSecurityHelper()
  -                        .grantPermission(token, dummyNodeRevisionDescriptor, permission);
  +                        .grantPermission(token, permission);
                   }
                   
               } catch (AccessDeniedException e) {