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

[Gavin King]

  User: gavin   
  Date: 06/11/08 12:32:43

  Modified:    src/main/org/jboss/seam/security/acl 
                        PersistentAclProvider.java
  Log:
  fix JBSEAM-456, don't hit UT from a container txn
  
  Revision  Changes    Path
  1.3       +10 -4     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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PersistentAclProvider.java	7 Nov 2006 04:33:47 -0000	1.2
  +++ PersistentAclProvider.java	8 Nov 2006 17:32:43 -0000	1.3
  @@ -1,19 +1,21 @@
   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;
  @@ -33,10 +35,12 @@
   @Scope(APPLICATION)
   public class PersistentAclProvider extends AbstractAclProvider
   {
  -  protected enum PersistenceType {
  +  protected enum PersistenceType 
  +  {
       managedPersistenceContext,
       managedHibernateSession,
  -    entityManagerFactory };
  +    entityManagerFactory 
  +  }
   
     protected PersistenceType persistenceType;
   
  @@ -191,6 +195,7 @@
       return null;
     }
   
  +  @Override
     public Set<Permission> getPermissions(Object obj, Principal principal)
     {
       try
  @@ -208,6 +213,7 @@
       return null;
     }
   
  +  @Override
     public Map<Principal,Set<Permission>> getPermissions(Object obj)
     {
       /** @todo implement this */