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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/11/08 23:18:50

  Modified:    src/main/org/jboss/seam/security/acl 
                        PersistentAclProvider.java
  Log:
  refactored
  
  Revision  Changes    Path
  1.6       +11 -22    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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- PersistentAclProvider.java	9 Nov 2006 03:26:15 -0000	1.5
  +++ PersistentAclProvider.java	9 Nov 2006 04:18:50 -0000	1.6
  @@ -42,7 +42,6 @@
     protected PersistenceType persistenceType;
   
     private Object pcm;
  -  private String aclUserQuery;
     private String aclQuery;
   
     public Object getPersistenceContextManager()
  @@ -85,16 +84,6 @@
           "ManagedHibernateSession or String value specifying the JNDI name of an EntityManagerFactory");
     }
   
  -  public String getAclUserQuery()
  -  {
  -    return aclUserQuery;
  -  }
  -
  -  public void setAclUserQuery(String aclUserQuery)
  -  {
  -    this.aclUserQuery = aclUserQuery;
  -  }
  -
     public String getAclQuery()
     {
       return aclQuery;
  @@ -105,20 +94,20 @@
       this.aclQuery = aclQuery;
     }
   
  -  protected Object createAclQuery(Principal principal)
  +  protected Object createAclQuery()
         throws Exception
     {
       switch (persistenceType)
       {
         case managedPersistenceContext:
  -        return ((ManagedPersistenceContext) pcm).getEntityManager().createQuery(aclUserQuery);
  +        return ((ManagedPersistenceContext) pcm).getEntityManager().createQuery(aclQuery);
         case managedHibernateSession:
  -        return ((ManagedHibernateSession) pcm).getSession().createQuery(aclUserQuery);
  +        return ((ManagedHibernateSession) pcm).getSession().createQuery(aclQuery);
         case entityManagerFactory:
           EntityManager em = ((EntityManagerFactory) pcm).createEntityManager();
           if ( !Lifecycle.isDestroying() && Transactions.isTransactionActive() )
              em.joinTransaction();
  -        return em.createQuery(aclUserQuery);
  +        return em.createQuery(aclQuery);
       }
   
       throw new IllegalStateException("Unknown persistence type");
  @@ -140,14 +129,12 @@
       {
         case managedPersistenceContext:
         case entityManagerFactory:
  -        ((Query) query).setParameter("recipient", principal.getName())
  -          .setParameter("roles", roles)
  -          .setParameter("identity", SeamSecurityManager.instance().getObjectIdentity(target));
  +        ((Query) query).setParameter("identity",
  +            SeamSecurityManager.instance().getObjectIdentity(target));
           break;
         case managedHibernateSession:
  -        ((org.hibernate.Query) query).setParameter("recipient", principal.getName())
  -            .setParameter("roles", roles)
  -            .setParameter("identity", SeamSecurityManager.instance().getObjectIdentity(target));
  +        ((org.hibernate.Query) query).setParameter("identity",
  +            SeamSecurityManager.instance().getObjectIdentity(target));
           break;
       }
     }
  @@ -168,6 +155,8 @@
   
     protected Set<Permission> convertToPermissions(Object target, Object perms)
     {
  +
  +
       /** @todo use the @AclProvider specified on the target object to convert
        * the specified permissions param to a set of actual permissions */
       return null;
  @@ -178,7 +167,7 @@
     {
       try
       {
  -      Object q = createAclQuery(principal);
  +      Object q = createAclQuery();
   
         bindQueryParams(q, obj, principal);