You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2017/04/06 13:32:09 UTC

svn commit: r1790400 - in /myfaces/trinidad/trunk: ./ trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ trinidad-examples/trinidad-blank/ trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/ trinidad-examples/trinidad-components-sh...

Author: bommel
Date: Thu Apr  6 13:32:08 2017
New Revision: 1790400

URL: http://svn.apache.org/viewvc?rev=1790400&view=rev
Log:
(TRINIDAD-2545)
Update of view state in partial response not working (JSF 2.2)

some more jsf 2.2 fixes and myfaces 2.2 fixes
added profile for jsf 2.2 see comment in root pom.xml
update jsf impl versions 
update jetty plugin

Modified:
    myfaces/trinidad/trunk/pom.xml
    myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
    myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml
    myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml
    myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentVariantDemo.java
    myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractComponentVariantDemo.java
    myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml
    myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml
    myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/trinidad/trunk/trinidad-impl/pom.xml
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsfUtils.java

Modified: myfaces/trinidad/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/pom.xml?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/pom.xml (original)
+++ myfaces/trinidad/trunk/pom.xml Thu Apr  6 13:32:08 2017
@@ -67,8 +67,8 @@ Create A Branch (http://maven.apache.org
     <jsp.version>2.1</jsp.version>
     <jstl.version>1.2</jstl.version>
     <jsf-spec.version>2.1</jsf-spec.version>
-    <jsf-ri.version>2.1.7</jsf-ri.version>
-    <jsf-myfaces.version>2.1.6</jsf-myfaces.version>
+    <jsf-ri.version>2.1.29-08</jsf-ri.version>
+    <jsf-myfaces.version>2.1.18</jsf-myfaces.version>
     <portlet-bridge.version>2.0.0</portlet-bridge.version>
     <commons-lang.version>2.4</commons-lang.version>
     <commons-io.version>2.0</commons-io.version>
@@ -84,7 +84,8 @@ Create A Branch (http://maven.apache.org
     <!-- Plugins -->
     <trinidad-plugins.version>2.0.8</trinidad-plugins.version>
     <wagon-plugin.version>1.0.6</wagon-plugin.version>
-    <jetty-plugin.version>6.1.21</jetty-plugin.version>
+    <jetty.groupId>org.mortbay.jetty</jetty.groupId>
+    <jetty-plugin.version>7.6.9.v20130131</jetty-plugin.version>
     <pluto.version>1.1.6</pluto.version>
     <pluto.package>org.apache.pluto</pluto.package>
     <myfaces-builder-plugin.version>1.0.9</myfaces-builder-plugin.version>
@@ -579,8 +580,8 @@ Create A Branch (http://maven.apache.org
         </plugin>
 
         <plugin>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>maven-jetty-plugin</artifactId>
+          <groupId>${jetty.groupId}</groupId>
+          <artifactId>jetty-maven-plugin</artifactId>
           <version>${jetty-plugin.version}</version>
         </plugin>
 
@@ -1035,6 +1036,22 @@ Create A Branch (http://maven.apache.org
       </dependencyManagement>      
     </profile>
 
+    <profile>
+      <id>jsfversion</id>
+      <activation>
+        <property>
+          <name>jsfversion</name>
+          <value>2.2</value>
+        </property>
+      </activation>
+      <properties>
+        <jsf-ri.version>2.2.14</jsf-ri.version>
+        <jsf-myfaces.version>2.2.12</jsf-myfaces.version>
+        <jetty.groupId>org.eclipse.jetty</jetty.groupId>
+        <jetty-plugin.version>9.2.13.v20150730</jetty-plugin.version>
+      </properties>
+    </profile>
+
   </profiles>
 
 </project>

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java Thu Apr  6 13:32:08 2017
@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.faces.FacesException;
+import javax.faces.application.StateManager;
 import javax.faces.component.ContextCallback;
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIComponent;
@@ -692,7 +693,7 @@ public abstract class UIXCollection exte
     super.setupVisitingContext(context);
     _setupContextChange();
 
-    if (Boolean.TRUE.equals(context.getAttributes().get("javax.faces.IS_SAVING_STATE")))
+    if (Boolean.TRUE.equals(context.getAttributes().get(StateManager.IS_SAVING_STATE)))
     {
       _stateSavingCurrencyKey = _resetCurrencyKeyForStateSaving(context);
     }
@@ -701,7 +702,7 @@ public abstract class UIXCollection exte
   @Override
   protected void tearDownVisitingContext(FacesContext context)
   {
-    if (Boolean.TRUE.equals(context.getAttributes().get("javax.faces.IS_SAVING_STATE")))
+    if (Boolean.TRUE.equals(context.getAttributes().get(StateManager.IS_SAVING_STATE)))
     {
       _restoreCurrencyKeyForStateSaving(_stateSavingCurrencyKey);
       _resetInternalState();

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml Thu Apr  6 13:32:08 2017
@@ -78,8 +78,8 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>maven-jetty-plugin</artifactId>
+            <groupId>${jetty.groupId}</groupId>
+            <artifactId>jetty-maven-plugin</artifactId>
             
             <configuration>
               <scanIntervalSeconds>10</scanIntervalSeconds>

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml Thu Apr  6 13:32:08 2017
@@ -20,7 +20,7 @@
 -->
 <faces-config xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"
               version="2.1">
   
   <application>

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml Thu Apr  6 13:32:08 2017
@@ -113,8 +113,8 @@
           <build>
             <plugins>
               <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
+                <groupId>${jetty.groupId}</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
                 <configuration>
                   <scanIntervalSeconds>10</scanIntervalSeconds>
                 </configuration>

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentVariantDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentVariantDemo.java?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentVariantDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IComponentVariantDemo.java Thu Apr  6 13:32:08 2017
@@ -106,5 +106,5 @@ public interface IComponentVariantDemo e
    * 
    * @return true if this component demo is static, otherwise returns false.
    */
-  boolean isStatic();
+  boolean isDynamic();
 }

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractComponentVariantDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractComponentVariantDemo.java?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractComponentVariantDemo.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractComponentVariantDemo.java Thu Apr  6 13:32:08 2017
@@ -102,8 +102,8 @@ public abstract class AbstractComponentV
     return null;
   }
 
-  public boolean isStatic() {
-    return getBackingBeanResourcePath() == null;
+  public boolean isDynamic() {
+    return getBackingBeanResourcePath() != null;
   }
 
     private String getDefault() {

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml Thu Apr  6 13:32:08 2017
@@ -20,7 +20,7 @@
 -->        
 <faces-config xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"
               version="2.1">    
 
   <application>

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/pages/componentDemo.xhtml Thu Apr  6 13:32:08 2017
@@ -108,7 +108,7 @@
                             </tr:showDetailItem>
                         </c:forEach>
 
-                        <tr:showDetailItem text="Backing Beans" rendered="#{!navigationHandler.currentComponentVariantDemo.static}">
+                        <tr:showDetailItem text="Backing Beans" rendered="#{navigationHandler.currentComponentVariantDemo.dynamic}">
                             <trd:outputSource value="#{navigationHandler.currentComponentVariantDemo.backingBeanResourcePath}"
                                               pathPrefix="/WEB-INF/src" styleClass="sourceCode" styleUsage="java"/>
                         </tr:showDetailItem>

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml Thu Apr  6 13:32:08 2017
@@ -170,9 +170,8 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>maven-jetty-plugin</artifactId>
-            
+            <groupId>${jetty.groupId}</groupId>
+            <artifactId>jetty-maven-plugin</artifactId>
             <configuration>
               <scanIntervalSeconds>10</scanIntervalSeconds>
             </configuration>
@@ -280,7 +279,7 @@
 		<build>      
         <plugins>
           <plugin>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>${jetty.groupId}</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
             <configuration>
               <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml Thu Apr  6 13:32:08 2017
@@ -20,7 +20,7 @@
 -->
 <faces-config xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"
               version="2.1">
 
   <application>

Modified: myfaces/trinidad/trunk/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/pom.xml?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/pom.xml Thu Apr  6 13:32:08 2017
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>com.sun.faces</groupId>
       <artifactId>jsf-api</artifactId>
-      <scope>provided</scope> 
+      <scope>provided</scope>
     </dependency>
 
     <dependency>

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Thu Apr  6 13:32:08 2017
@@ -67,6 +67,7 @@ import org.apache.myfaces.trinidad.util.
 import org.apache.myfaces.trinidad.util.ref.StrongPseudoReferenceFactory;
 import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
 import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
+import org.apache.myfaces.trinidadinternal.util.JsfUtils;
 import org.apache.myfaces.trinidadinternal.util.ObjectInputStreamResolveClass;
 import org.apache.myfaces.trinidadinternal.util.SubKeyMap;
 import org.apache.myfaces.trinidadinternal.util.TokenCache;
@@ -191,9 +192,7 @@ public class StateManagerImpl extends St
     
     try
     {
-      // TODO Once we're dependent on JSF 2.1 we should be using StateManager.IS_SAVING_STATE as the key, but 
-      // for now we can use the String value of StateManager.IS_SAVING_STATE
-      contextAttributes.put("javax.faces.IS_SAVING_STATE", Boolean.TRUE);
+      contextAttributes.put(StateManager.IS_SAVING_STATE, Boolean.TRUE);
       
       if (sms != null)
       {
@@ -220,9 +219,7 @@ public class StateManagerImpl extends St
     }
     finally 
     {
-      // TODO Once we're dependent on JSF 2.1 we should be using StateManager.IS_SAVING_STATE as the key, but 
-      // for now we can use the String value of StateManager.IS_SAVING_STATE
-      contextAttributes.remove("javax.faces.IS_SAVING_STATE");
+      contextAttributes.remove(StateManager.IS_SAVING_STATE);
     }
 
     if (_saveAsToken(context, false))
@@ -1237,10 +1234,21 @@ public class StateManagerImpl extends St
       String caseInsensitiveViewRootCaching;
       
       if ((viewRootCaching != null) && (viewRootCaching.length() > 0))
+      {
         caseInsensitiveViewRootCaching = viewRootCaching.toLowerCase();
+      }
       else
-        caseInsensitiveViewRootCaching = "true"; // the default
-      
+      {
+        // ViewRootCaching conflicts with myfaces >= 2,2
+        if (JsfUtils.IS_JSF_2_2 && JsfUtils.IS_MYFACES)
+        {
+          caseInsensitiveViewRootCaching = "false";
+        }
+        else
+        {
+          caseInsensitiveViewRootCaching = "true"; // the default
+        }
+      }
       PseudoReferenceFactory<ViewRootState> factory;
   
       if ("false".equals(caseInsensitiveViewRootCaching))

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Thu Apr  6 13:32:08 2017
@@ -439,15 +439,7 @@ public class FormRenderer extends XhtmlR
       rw.writeAttribute("value", state, null);
       rw.endElement("input");
     }
-    else
-    {
-      // Include JSF state.
-      // Note that MultiViewHandler in JSF RI will not write the state
-      // for any AJAX requests. PartialViewContextImpl will write out the state
-      // for these requets
-      context.getApplication().getViewHandler().writeState(context);
-    }
-    
+
     // Include the Window state, if any
     RequestContext.getCurrentInstance().getWindowManager().writeState(context);
 
@@ -471,6 +463,17 @@ public class FormRenderer extends XhtmlR
     // Close up our postscript span if we have one
     if (postscriptId != null)
       rw.endElement("span");
+
+    if (!(isPDA(rc) &&
+            RequestContext.getCurrentInstance().isPartialRequest(context)))
+    {
+      // Include JSF state.
+      // Note that MultiViewHandler in JSF RI will not write the state
+      // for any AJAX requests. PartialViewContextImpl will write out the state
+      // for these requets
+      context.getApplication().getViewHandler().writeState(context);
+    }
+
   }
 
   @Override

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsfUtils.java?rev=1790400&r1=1790399&r2=1790400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsfUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsfUtils.java Thu Apr  6 13:32:08 2017
@@ -22,6 +22,8 @@ public class JsfUtils {
 
     public static final boolean IS_JSF_2_2 = ClassUtils.isPresent("javax.faces.flow.Flow");
 
+    public static final boolean IS_MYFACES = ClassUtils.isPresent("org.apache.myfaces.application.ApplicationImpl");
+
     private JsfUtils() {
     }