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 15:23:17 UTC
svn commit: r1813315 - in /myfaces/core/branches/2.0.x:
impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
Author: embreijo
Date: Wed Oct 25 15:23:17 2017
New Revision: 1813315
URL: http://svn.apache.org/viewvc?rev=1813315&view=rev
Log:
revert MYFACES-4166 changes
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
myfaces/core/branches/2.0.x/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java?rev=1813315&r1=1813314&r2=1813315&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java Wed Oct 25 15:23:17 2017
@@ -29,7 +29,6 @@ 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.context.ExceptionHandlerImpl;
import org.apache.myfaces.shared.util.StateUtils;
import org.apache.myfaces.shared.util.WebConfigParamUtils;
@@ -66,6 +65,13 @@ 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.
@@ -122,8 +128,7 @@ 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(
- MyFacesContainerInitializer.FACES_SERVLET_ADDED_ATTRIBUTE);
+ Boolean mappingAdded = (Boolean) servletContext.getAttribute(FACES_SERVLET_ADDED_ATTRIBUTE);
if (mappingAdded == null || !mappingAdded)
{
if (log.isLoggable(Level.WARNING))
@@ -300,8 +305,7 @@ 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(
- MyFacesContainerInitializer.FACES_SERVLET_ADDED_ATTRIBUTE);
+ Boolean mappingAdded = (Boolean) servletContext.getAttribute(FACES_SERVLET_ADDED_ATTRIBUTE);
if (mappingAdded == null || !mappingAdded)
{
if (log.isLoggable(Level.WARNING))
Modified: myfaces/core/branches/2.0.x/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java?rev=1813315&r1=1813314&r2=1813315&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java (original)
+++ myfaces/core/branches/2.0.x/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java Wed Oct 25 15:23:17 2017
@@ -96,8 +96,9 @@ 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.
*/
- public static final String FACES_SERVLET_ADDED_ATTRIBUTE = "org.apache.myfaces.DYNAMICALLY_ADDED_FACES_SERVLET";
+ private 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";
private static final String FACES_CONFIG_RESOURCE = "/WEB-INF/faces-config.xml";