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/12 11:50:20 UTC
svn commit: r393423 -
/myfaces/shared/branches/2_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
Author: imario
Date: Wed Apr 12 02:50:17 2006
New Revision: 393423
URL: http://svn.apache.org/viewcvs?rev=393423&view=rev
Log:
packported check if tomahawk is available and disabling of
"Autoscrolling, DetectJavascript, AddResourceClass and
CheckExtensionsFilter" if its not.
Modified:
myfaces/shared/branches/2_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
Modified: myfaces/shared/branches/2_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewcvs/myfaces/shared/branches/2_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?rev=393423&r1=393422&r2=393423&view=diff
==============================================================================
--- myfaces/shared/branches/2_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/shared/branches/2_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Wed Apr 12 02:50:17 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;
@@ -65,6 +66,24 @@
private boolean _autoScroll;
private String _addResourceClass;
+ 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
@@ -78,12 +97,23 @@
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,
+ if (TOMAHAWK_AVAILABLE)
+ {
+ myfacesConfig.setDetectJavascript(getBooleanInitParameter(extCtx, INIT_PARAM_DETECT_JAVASCRIPT,
INIT_PARAM_DETECT_JAVASCRIPT_DEFAULT));
- myfacesConfig.setAutoScroll(getBooleanInitParameter(extCtx, INIT_PARAM_AUTO_SCROLL,
+ myfacesConfig.setAutoScroll(getBooleanInitParameter(extCtx, INIT_PARAM_AUTO_SCROLL,
INIT_PARAM_AUTO_SCROLL_DEFAULT));
- myfacesConfig.setAddResourceClass(getStringInitParameter(extCtx, INIT_PARAM_ADD_RESOURCE_CLASS,
+ myfacesConfig.setAddResourceClass(getStringInitParameter(extCtx, INIT_PARAM_ADD_RESOURCE_CLASS,
INIT_PARAM_ADD_RESOURCE_CLASS_DEFAULT));
+ }
+ else
+ {
+ if (log.isInfoEnabled())
+ {
+ log.info("Tomahawk jar not available. Autoscrolling, DetectJavascript, AddResourceClass and CheckExtensionsFilter are disabled now.");
+ }
+ }
+
return myfacesConfig;
}