[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security/acl ...

[Shane Bryzak]

  User: sbryzak2
  Date: 06/12/10 19:56:30

  Modified:    src/main/org/jboss/seam/security/acl 
                        PersistentAclProvider.java
  Log:
  rule-based permission check
  
  Revision  Changes    Path
  1.15      +15 -19    jboss-seam/src/main/org/jboss/seam/security/acl/PersistentAclProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PersistentAclProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/acl/PersistentAclProvider.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- PersistentAclProvider.java	4 Dec 2006 04:23:51 -0000	1.14
  +++ PersistentAclProvider.java	11 Dec 2006 00:56:30 -0000	1.15
  @@ -1,8 +1,5 @@
   package org.jboss.seam.security.acl;
   
  -import static org.jboss.seam.InterceptionType.NEVER;
  -import static org.jboss.seam.ScopeType.APPLICATION;
  -
   import java.security.Principal;
   import java.security.acl.Permission;
   import java.util.ArrayList;
  @@ -10,21 +7,20 @@
   import java.util.List;
   import java.util.Map;
   import java.util.Set;
  -
   import javax.naming.NamingException;
   import javax.persistence.EntityManager;
   import javax.persistence.EntityManagerFactory;
   import javax.persistence.Query;
   
  +import static org.jboss.seam.InterceptionType.NEVER;
  +import static org.jboss.seam.ScopeType.APPLICATION;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.core.ManagedHibernateSession;
   import org.jboss.seam.core.ManagedPersistenceContext;
   import org.jboss.seam.security.Identity;
  -import org.jboss.seam.security.SeamPermission;
  -import org.jboss.seam.security.SeamSecurityManager;
  -import org.jboss.seam.util.Naming;
   import org.jboss.seam.security.Role;
  +import org.jboss.seam.util.Naming;
   
   /**
    * Persistent Acl provider.
  @@ -133,18 +129,18 @@
         }
       }
   
  -    switch (persistenceType)
  -    {
  -      case managedPersistenceContext:
  -      case entityManagerFactory:
  -        ((Query) query).setParameter("identity",
  -            SeamSecurityManager.instance().getObjectIdentity(target));
  -        break;
  -      case managedHibernateSession:
  -        ((org.hibernate.Query) query).setParameter("identity",
  -            SeamSecurityManager.instance().getObjectIdentity(target));
  -        break;
  -    }
  +//    switch (persistenceType)
  +//    {
  +//      case managedPersistenceContext:
  +//      case entityManagerFactory:
  +//        ((Query) query).setParameter("identity",
  +//            SeamSecurityManager.instance().getObjectIdentity(target));
  +//        break;
  +//      case managedHibernateSession:
  +//        ((org.hibernate.Query) query).setParameter("identity",
  +//            SeamSecurityManager.instance().getObjectIdentity(target));
  +//        break;
  +//    }
     }
   
     protected Object executeQuery(Object query)