[seam-commits] Seam SVN: r7701 - trunk/src/main/org/jboss/seam/security/management.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-03-26 06:50:24 -0400 (Wed, 26 Mar 2008)
New Revision: 7701

Modified:
   trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
Log:
Use Seam's ValueExpression rather than el-api ValueExpression

Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java	2008-03-26 06:50:58 UTC (rev 7700)
+++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java	2008-03-26 10:50:24 UTC (rev 7701)
@@ -10,7 +10,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.el.ValueExpression;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 
@@ -21,6 +20,7 @@
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.core.Events;
 import org.jboss.seam.core.Expressions;
+import org.jboss.seam.core.Expressions.ValueExpression;
 import org.jboss.seam.security.Identity;
 import org.jboss.seam.security.management.UserAccount.AccountType;
 
@@ -40,7 +40,7 @@
    
    protected FeatureSet featureSet = new FeatureSet(FeatureSet.FEATURE_ALL);
    
-   private ValueExpression entityManager;  
+   private ValueExpression<EntityManager> entityManager;  
    
    private Class<? extends UserAccount> accountClass;
    
@@ -553,7 +553,7 @@
    
    private EntityManager lookupEntityManager()
    {
-      return (EntityManager) entityManager.getValue(Expressions.instance().getELContext());
+      return entityManager.getValue();
    }
    
    public ValueExpression getEntityManager()