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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/11/08 22:26:15

  Modified:    src/main/org/jboss/seam/security/acl 
                        PersistentAclProvider.java
  Log:
  refactored
  
  Revision  Changes    Path
  1.5       +12 -14    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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PersistentAclProvider.java	8 Nov 2006 23:28:38 -0000	1.4
  +++ PersistentAclProvider.java	9 Nov 2006 03:26:15 -0000	1.5
  @@ -1,31 +1,27 @@
   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;
   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 javax.transaction.SystemException;
   
  +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.contexts.Lifecycle;
   import org.jboss.seam.core.ManagedHibernateSession;
   import org.jboss.seam.core.ManagedPersistenceContext;
  -import org.jboss.seam.persistence.PersistenceProvider;
   import org.jboss.seam.security.Authentication;
  +import org.jboss.seam.security.SeamSecurityManager;
   import org.jboss.seam.util.Naming;
   import org.jboss.seam.util.Transactions;
  -import org.jboss.seam.security.SeamSecurityManager;
   
   /**
    * Persistent Acl provider.
  @@ -143,15 +139,15 @@
       switch (persistenceType)
       {
         case managedPersistenceContext:
  +      case entityManagerFactory:
           ((Query) query).setParameter("recipient", principal.getName())
             .setParameter("roles", roles)
             .setParameter("identity", SeamSecurityManager.instance().getObjectIdentity(target));
           break;
         case managedHibernateSession:
  -        /** @todo implement */
  -        break;
  -      case entityManagerFactory:
  -        /** @todo implement */
  +        ((org.hibernate.Query) query).setParameter("recipient", principal.getName())
  +            .setParameter("roles", roles)
  +            .setParameter("identity", SeamSecurityManager.instance().getObjectIdentity(target));
           break;
       }
     }
  @@ -161,8 +157,10 @@
       switch (persistenceType)
       {
         case managedPersistenceContext:
  +      case entityManagerFactory:
           return ((Query) query).getResultList();
  -      /** @todo Implement hibernate and emf support */
  +      case managedHibernateSession:
  +        return ((org.hibernate.Query) query).list();
       }
   
       return null;