[webbeans-commits] Webbeans SVN: r3663 - in ri/trunk: impl/src/main/java/org/jboss/webbeans and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-09-14 13:57:21 -0400 (Mon, 14 Sep 2009)
New Revision: 3663

Modified:
   ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
Log:
Add wrapExpressionFactory

Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
===================================================================
--- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java	2009-09-14 17:55:44 UTC (rev 3662)
+++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java	2009-09-14 17:57:21 UTC (rev 3663)
@@ -23,6 +23,7 @@
 import java.util.Set;
 
 import javax.el.ELResolver;
+import javax.el.ExpressionFactory;
 import javax.enterprise.context.ContextNotActiveException;
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
@@ -261,6 +262,14 @@
    public ELResolver getELResolver();
    
    /**
+    * Returns an ExpressionFactory 
+    * 
+    * @param expressionFactory
+    * @return
+    */
+   public ExpressionFactory wrapExpressionFactory(ExpressionFactory expressionFactory);
+   
+   /**
     * Get an {@link AnnotatedType} for the given class
     * @param <T> the type
     * @param type the type

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java	2009-09-14 17:55:44 UTC (rev 3662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java	2009-09-14 17:57:21 UTC (rev 3663)
@@ -38,6 +38,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.el.ELResolver;
+import javax.el.ExpressionFactory;
 import javax.enterprise.context.ContextNotActiveException;
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
@@ -57,8 +58,8 @@
 import javax.inject.Qualifier;
 
 import org.jboss.webbeans.bean.DecoratorImpl;
+import org.jboss.webbeans.bean.RIBean;
 import org.jboss.webbeans.bean.SessionBean;
-import org.jboss.webbeans.bean.RIBean;
 import org.jboss.webbeans.bean.proxy.ClientProxyProvider;
 import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
 import org.jboss.webbeans.context.CreationalContextImpl;
@@ -67,6 +68,7 @@
 import org.jboss.webbeans.ejb.spi.EjbDescriptor;
 import org.jboss.webbeans.el.Namespace;
 import org.jboss.webbeans.el.WebBeansELResolver;
+import org.jboss.webbeans.el.WebBeansExpressionFactory;
 import org.jboss.webbeans.introspector.WBAnnotated;
 import org.jboss.webbeans.literal.AnyLiteral;
 import org.jboss.webbeans.literal.DefaultLiteral;
@@ -1324,6 +1326,11 @@
       return webbeansELResolver;
    }
    
+   public ExpressionFactory wrapExpressionFactory(ExpressionFactory expressionFactory)
+   {
+      return new WebBeansExpressionFactory(expressionFactory);
+   }
+   
    public <T> WBCreationalContext<T> createCreationalContext(Contextual<T> contextual)
    {
       return new CreationalContextImpl<T>(contextual);