svn commit: r1650238 - /openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java

[rmannibucau]

Author: rmannibucau
Date: Thu Jan  8 09:33:53 2015
New Revision: 1650238

URL: http://svn.apache.org/r1650238
Log:
conversation EL name was just forbidden, removing the hack

Modified:
    
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java

Modified: 
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java?rev=1650238&r1=1650237&r2=1650238&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
 (original)
+++ 
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
 Thu Jan  8 09:33:53 2015
@@ -26,7 +26,6 @@ import org.apache.webbeans.el.ELContextS
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ELResolver;
-import javax.enterprise.context.Conversation;
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
@@ -54,15 +53,11 @@ import java.util.Set;
  */
 public class WebBeansELResolver extends ELResolver
 {
-    private static final Javax JAVAX = new Javax();
-
     private WebBeansContext webBeansContext;
-    private boolean supportJavax;
 
     public WebBeansELResolver()
     {
         webBeansContext = WebBeansContext.getInstance();
-        supportJavax = 
"true".equalsIgnoreCase(webBeansContext.getOpenWebBeansConfiguration().getProperty("openwebbeans.el.support-javax",
 "true"));
     }
     
     /**
@@ -141,11 +136,6 @@ public class WebBeansELResolver extends
                 contextualInstance = 
getNormalScopedContextualInstance(beanManager, elContextStore, context, bean, 
beanName);
             }
         }
-        if (contextualInstance == null && supportJavax && 
"javax".equals(property))
-        {
-            context.setPropertyResolved(true);
-            return JAVAX;
-        }
         return contextualInstance;
     }
 
@@ -222,32 +212,4 @@ public class WebBeansELResolver extends
     {
 
     }
-
-    public static class Javax
-    {
-        private static final Enterprise ENTERPRISE = new Enterprise();
-
-        public Enterprise getEnterprise()
-        {
-            return ENTERPRISE;
-        }
-    }
-
-    public static class Enterprise
-    {
-        private static final Context CONTEXT = new Context();
-
-        public Context getContext()
-        {
-            return CONTEXT;
-        }
-    }
-
-    public static class Context
-    {
-        public Conversation getConversation()
-        {
-            return 
WebBeansContext.currentInstance().getConversationManager().getConversationBeanReference();
-        }
-    }
 }