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/10/25 14:19:35 UTC
svn commit: r1813298 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces:
ee6/MyFacesContainerInitializer.java webapp/AbstractFacesInitializer.java
Author: embreijo
Date: Wed Oct 25 14:19:34 2017
New Revision: 1813298
URL: http://svn.apache.org/viewvc?rev=1813298&view=rev
Log:
MYFACES-4166 Make FACES_SERVLET_ADDED_ATTRIBUTE key public
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java?rev=1813298&r1=1813297&r2=1813298&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java Wed Oct 25 14:19:34 2017
@@ -109,9 +109,8 @@ public class MyFacesContainerInitializer
/**
* If the servlet mapping for the FacesServlet is added dynamically, Boolean.TRUE
* is stored under this key in the ServletContext.
- * ATTENTION: this constant is duplicate in AbstractFacesInitializer.
*/
- private static final String FACES_SERVLET_ADDED_ATTRIBUTE = "org.apache.myfaces.DYNAMICALLY_ADDED_FACES_SERVLET";
+ public static final String FACES_SERVLET_ADDED_ATTRIBUTE = "org.apache.myfaces.DYNAMICALLY_ADDED_FACES_SERVLET";
private static final String INITIALIZE_ALWAYS_STANDALONE = "org.apache.myfaces.INITIALIZE_ALWAYS_STANDALONE";
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java?rev=1813298&r1=1813297&r2=1813298&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java Wed Oct 25 14:19:34 2017
@@ -27,6 +27,7 @@ import org.apache.myfaces.config.element
import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
+import org.apache.myfaces.ee6.MyFacesContainerInitializer;
import org.apache.myfaces.shared.util.StateUtils;
import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.cdi.dependent.BeanEntry;
@@ -75,13 +76,6 @@ public abstract class AbstractFacesIniti
*/
//private static final Log log = LogFactory.getLog(AbstractFacesInitializer.class);
private static final Logger log = Logger.getLogger(AbstractFacesInitializer.class.getName());
-
- /**
- * If the servlet mapping for the FacesServlet is added dynamically, Boolean.TRUE
- * is stored under this key in the ServletContext.
- * ATTENTION: this constant is duplicate in MyFacesContainerInitializer.
- */
- private static final String FACES_SERVLET_ADDED_ATTRIBUTE = "org.apache.myfaces.DYNAMICALLY_ADDED_FACES_SERVLET";
/**
* This parameter specifies the ExpressionFactory implementation to use.
@@ -155,7 +149,8 @@ public abstract class AbstractFacesIniti
{
// check if the FacesServlet has been added dynamically
// in a Servlet 3.0 environment by MyFacesContainerInitializer
- Boolean mappingAdded = (Boolean) servletContext.getAttribute(FACES_SERVLET_ADDED_ATTRIBUTE);
+ Boolean mappingAdded = (Boolean) servletContext.getAttribute(
+ MyFacesContainerInitializer.FACES_SERVLET_ADDED_ATTRIBUTE);
if (mappingAdded == null || !mappingAdded)
{
if (log.isLoggable(Level.WARNING))
@@ -349,7 +344,8 @@ public abstract class AbstractFacesIniti
{
// check if the FacesServlet has been added dynamically
// in a Servlet 3.0 environment by MyFacesContainerInitializer
- Boolean mappingAdded = (Boolean) servletContext.getAttribute(FACES_SERVLET_ADDED_ATTRIBUTE);
+ Boolean mappingAdded = (Boolean) servletContext.getAttribute(
+ MyFacesContainerInitializer.FACES_SERVLET_ADDED_ATTRIBUTE);
if (mappingAdded == null || !mappingAdded)
{
if (log.isLoggable(Level.WARNING))