svn commit: r911438 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java

[mc...@apache.org]

Author: mconcini
Date: Thu Feb 18 15:29:18 2010
New Revision: 911438

URL: http://svn.apache.org/viewvc?rev=911438&view=rev
Log:
MYFACES-2564 - facelets in an app with a 1.2 level faces-config does not work

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java?rev=911438&r1=911437&r2=911438&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java Thu Feb 18 15:29:18 2010
@@ -112,7 +112,6 @@
     /**
      * Determines if the current application uses Facelets-2.
      * To accomplish that it looks at the init param javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER,
-     * at the version attribute of the faces-config
      * and it also looks if the Facelets-1 ViewHandler com.sun.facelets.FaceletViewHandler is present. 
      * 
      * @return <code>true</code> if the current application uses the built in Facelets-2,
@@ -123,10 +122,11 @@
         FacesContext context = FacesContext.getCurrentInstance();
         String param = context.getExternalContext().getInitParameter(PARAM_DISABLE_JSF_FACELET);
         boolean facelets2ParamDisabled = (param != null && Boolean.parseBoolean(param.toLowerCase()));
-        boolean jsf20 = "2.0".equals(RuntimeConfig.getCurrentInstance(context.getExternalContext()).getFacesVersion());
+       // boolean jsf20 = "2.0".equals(RuntimeConfig.getCurrentInstance(context.getExternalContext()).getFacesVersion());
         boolean facelets1ViewHandlerPresent  = context.getApplication().getViewHandler()
                                                    .getClass().getName().equals(FACELETS_1_VIEW_HANDLER);
         
-        return !facelets2ParamDisabled && jsf20 && !facelets1ViewHandlerPresent;
+        //return !facelets2ParamDisabled && jsf20 && !facelets1ViewHandlerPresent;
+        return !facelets2ParamDisabled && !facelets1ViewHandlerPresent;
     }
 }