You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/08/12 02:52:18 UTC

svn commit: r1513022 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java

Author: lu4242
Date: Mon Aug 12 00:52:18 2013
New Revision: 1513022

URL: http://svn.apache.org/r1513022
Log:
MYFACES-3747 Implement new JSF 2.2 ViewScope specification (CDI BeanManager must be set before JSF configuration because Faces Flow requires it)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java

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=1513022&r1=1513021&r2=1513022&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 Mon Aug 12 00:52:18 2013
@@ -149,10 +149,10 @@ public abstract class AbstractFacesIniti
                 }
             }
 
-            initContainerIntegration(servletContext, externalContext);
-            
             initCDIIntegration(servletContext, externalContext);
             
+            initContainerIntegration(servletContext, externalContext);
+            
             ViewScopeProviderFactory factory = ViewScopeProviderFactory.getViewScopeHandlerFactory(
                 externalContext);