You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by em...@apache.org on 2017/08/01 18:58:45 UTC

svn commit: r1803688 - in /myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi: faces/ApplicationScopeObjectProducer.java faces/FacesScopeObjectProducer.java viewTransient/ViewTransientScopeObjectProducer.java

Author: embreijo
Date: Tue Aug  1 18:58:45 2017
New Revision: 1803688

URL: http://svn.apache.org/viewvc?rev=1803688&view=rev
Log:
MYFACES-4129 When @FacesConfig annotation is used in a CDI bean, implicit EL objects don't work

Modified:
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewTransient/ViewTransientScopeObjectProducer.java

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java?rev=1803688&r1=1803687&r2=1803688&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java Tue Aug  1 18:58:45 2017
@@ -28,6 +28,7 @@ import javax.faces.annotation.InitParame
 import javax.faces.application.Application;
 import javax.faces.application.ResourceHandler;
 import javax.faces.context.FacesContext;
+import javax.inject.Named;
 
 /**
  *
@@ -36,6 +37,7 @@ public class ApplicationScopeObjectProdu
 {
     
    @Produces
+   @Named("application")
    @ApplicationScoped
    public Application getApplication()
    {
@@ -43,6 +45,7 @@ public class ApplicationScopeObjectProdu
    }
    
    @Produces
+   @Named("applicationScope")
    @ApplicationMap
    @ApplicationScoped
    public Map<String, Object> getApplicationMap()
@@ -51,6 +54,7 @@ public class ApplicationScopeObjectProdu
    }
 
    @Produces
+   @Named("initParam")
    @InitParameterMap
    @ApplicationScoped
    public Map<String, String> getInitParameterMap()
@@ -59,6 +63,7 @@ public class ApplicationScopeObjectProdu
    }
    
    @Produces
+   @Named("resource")
    @ApplicationScoped
    public ResourceHandler getResourceHandler()
    {
@@ -66,6 +71,7 @@ public class ApplicationScopeObjectProdu
    }
 
    @Produces
+   @Named("flowScope")
    @FlowMap
    @ApplicationScoped
    public Map<Object, Object> getFlowMap()

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java?rev=1803688&r1=1803687&r2=1803688&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java Tue Aug  1 18:58:45 2017
@@ -29,10 +29,12 @@ import javax.faces.annotation.RequestMap
 import javax.faces.annotation.RequestParameterMap;
 import javax.faces.annotation.RequestParameterValuesMap;
 import javax.faces.annotation.SessionMap;
+import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.context.Flash;
+import javax.inject.Named;
 
 /**
  * This class produces all objects that are bound or related to FacesContext
@@ -42,6 +44,7 @@ public class FacesScopeObjectProducer
 {
     
    @Produces
+   @Named("facesContext")
    @FacesScoped 
    public FacesContext getFacesContext()
    {
@@ -49,6 +52,7 @@ public class FacesScopeObjectProducer
    }
    
    @Produces
+   @Named("externalContext")
    @FacesScoped 
    public ExternalContext getExternalContext()
    {
@@ -56,6 +60,7 @@ public class FacesScopeObjectProducer
    }
    
    @Produces
+   @Named("flash")
    @FacesScoped 
    public Flash getFlash()
    {
@@ -63,6 +68,7 @@ public class FacesScopeObjectProducer
    }
    
    @Produces
+   @Named("header")
    @HeaderMap
    @FacesScoped
    public Map<String, String> getHeaderMap()
@@ -71,6 +77,7 @@ public class FacesScopeObjectProducer
    }
 
    @Produces
+   @Named("headerValues")
    @HeaderValuesMap
    @FacesScoped
    public Map<String, String[]> getHeaderValuesMap()
@@ -79,6 +86,7 @@ public class FacesScopeObjectProducer
    }
 
    @Produces
+   @Named("requestScope")
    @RequestMap
    @FacesScoped
    public Map<String, Object> getRequestMap()
@@ -87,6 +95,7 @@ public class FacesScopeObjectProducer
    }   
    
    @Produces
+   @Named("cookie")
    @RequestCookieMap
    @FacesScoped
    public Map<String, Object> getRequestCookieMap()
@@ -95,6 +104,7 @@ public class FacesScopeObjectProducer
    }
    
    @Produces
+   @Named("param")
    @RequestParameterMap
    @FacesScoped
    public Map<String, String> getRequestParameterMap()
@@ -103,6 +113,7 @@ public class FacesScopeObjectProducer
    }
    
    @Produces
+   @Named("paramValues")
    @RequestParameterValuesMap
    @FacesScoped
    public Map<String, String[]> getRequestParameterValuesMap()
@@ -111,6 +122,7 @@ public class FacesScopeObjectProducer
    }   
 
    @Produces
+   @Named("sessionScope")
    @SessionMap
    @FacesScoped
    public Map<String, Object> getSessionMap()
@@ -119,10 +131,35 @@ public class FacesScopeObjectProducer
    }
 
    @Produces
+   @Named("view")
    @FacesScoped
    public UIViewRoot getViewRoot() 
    {
        return FacesContext.getCurrentInstance().getViewRoot();
    }
+
+   @Produces
+   @Named("session")
+   @FacesScoped
+   public Object getSession()
+   {
+       return FacesContext.getCurrentInstance().getExternalContext().getSession(false);
+   }
+   
+   @Produces
+   @Named("component")
+   @FacesScoped
+   public UIComponent getComponent() 
+   {
+       return UIComponent.getCurrentComponent(FacesContext.getCurrentInstance());
+   }
+   
+   @Produces
+   @Named("cc")
+   @FacesScoped
+   public UIComponent getCompositeComponent() 
+   {
+       return UIComponent.getCurrentCompositeComponent(FacesContext.getCurrentInstance());
+   }
    
 }

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewTransient/ViewTransientScopeObjectProducer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewTransient/ViewTransientScopeObjectProducer.java?rev=1803688&r1=1803687&r2=1803688&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewTransient/ViewTransientScopeObjectProducer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewTransient/ViewTransientScopeObjectProducer.java Tue Aug  1 18:58:45 2017
@@ -24,6 +24,7 @@ import javax.enterprise.context.Applicat
 import javax.enterprise.inject.Produces;
 import javax.faces.annotation.ViewMap;
 import javax.faces.context.FacesContext;
+import javax.inject.Named;
 
 /**
  * This class produces all objects that are bound or related to FacesContext
@@ -33,6 +34,7 @@ public class ViewTransientScopeObjectPro
 {
    
    @Produces
+   @Named("viewScope")
    @ViewMap
    @ViewTransientScoped
    public Map<String, Object> getViewMap()