You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2006/04/11 23:00:31 UTC
svn commit: r393309 -
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
Author: imario
Date: Tue Apr 11 14:00:30 2006
New Revision: 393309
URL: http://svn.apache.org/viewcvs?rev=393309&view=rev
Log:
disable tomahawk features if tomahawk jar isnt available
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?rev=393309&r1=393308&r2=393309&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Tue Apr 11 14:00:30 2006
@@ -19,6 +19,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared.util.ClassUtils;
import javax.faces.context.ExternalContext;
import javax.servlet.ServletContext;
@@ -69,6 +70,24 @@
private String _addResourceClass;
private boolean _checkExtensionsFilter;
+ private static final boolean TOMAHAWK_AVAILABLE;
+
+ static
+ {
+ boolean tomahawkAvailable;
+ try
+ {
+ ClassUtils
+ .classForName("org.apache.myfaces.webapp.filter.ExtensionsFilter");
+ tomahawkAvailable = true;
+ }
+ catch (ClassNotFoundException e)
+ {
+ tomahawkAvailable = false;
+ }
+ TOMAHAWK_AVAILABLE = tomahawkAvailable;
+ }
+
public static MyfacesConfig getCurrentInstance(ExternalContext extCtx)
{
MyfacesConfig myfacesConfig = (MyfacesConfig)extCtx
@@ -82,17 +101,24 @@
INIT_PARAM_PRETTY_HTML_DEFAULT));
myfacesConfig.setAllowJavascript(getBooleanInitParameter(extCtx, INIT_PARAM_ALLOW_JAVASCRIPT,
INIT_PARAM_ALLOW_JAVASCRIPT_DEFAULT));
- myfacesConfig.setDetectJavascript(getBooleanInitParameter(extCtx, INIT_PARAM_DETECT_JAVASCRIPT,
- INIT_PARAM_DETECT_JAVASCRIPT_DEFAULT));
- myfacesConfig.setAutoScroll(getBooleanInitParameter(extCtx, INIT_PARAM_AUTO_SCROLL,
- INIT_PARAM_AUTO_SCROLL_DEFAULT));
- myfacesConfig.setAddResourceClass(getStringInitParameter(extCtx, INIT_PARAM_ADD_RESOURCE_CLASS,
- INIT_PARAM_ADD_RESOURCE_CLASS_DEFAULT));
- myfacesConfig.setAddResourceClass(getStringInitParameter(extCtx, INIT_PARAM_ADD_RESOURCE_CLASS,
- INIT_PARAM_ADD_RESOURCE_CLASS_DEFAULT));
-
- myfacesConfig.setCheckExtensionsFilter(getBooleanInitParameter(extCtx, INIT_CHECK_EXTENSIONS_FILTER,
- INIT_CHECK_EXTENSIONS_FILTER_DEFAULT));
+ if (TOMAHAWK_AVAILABLE)
+ {
+ myfacesConfig.setDetectJavascript(getBooleanInitParameter(extCtx, INIT_PARAM_DETECT_JAVASCRIPT,
+ INIT_PARAM_DETECT_JAVASCRIPT_DEFAULT));
+ myfacesConfig.setAutoScroll(getBooleanInitParameter(extCtx, INIT_PARAM_AUTO_SCROLL,
+ INIT_PARAM_AUTO_SCROLL_DEFAULT));
+ myfacesConfig.setAddResourceClass(getStringInitParameter(extCtx, INIT_PARAM_ADD_RESOURCE_CLASS,
+ INIT_PARAM_ADD_RESOURCE_CLASS_DEFAULT));
+ myfacesConfig.setCheckExtensionsFilter(getBooleanInitParameter(extCtx, INIT_CHECK_EXTENSIONS_FILTER,
+ INIT_CHECK_EXTENSIONS_FILTER_DEFAULT));
+ }
+ else
+ {
+ if (log.isInfoEnabled())
+ {
+ log.info("Tomahawk jar not available. Autoscrolling, DetectJavascript, AddResourceClass and CheckExtensionsFilter are disabled now.");
+ }
+ }
return myfacesConfig;
}
Re: svn commit: r393309 - /myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
Posted by Mike Kienenberger <mk...@gmail.com>.
On 4/11/06, imario@apache.org <im...@apache.org> wrote:
> Author: imario
> Date: Tue Apr 11 14:00:30 2006
> New Revision: 393309
>
> URL: http://svn.apache.org/viewcvs?rev=393309&view=rev
> Log:
> disable tomahawk features if tomahawk jar isnt available
Looks like a good way to implement it to me. Let's hope we can
finally make a release :)