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/01 22:44:24 UTC

svn commit: r390749 - /myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java

Author: imario
Date: Sat Apr  1 12:44:22 2006
New Revision: 390749

URL: http://svn.apache.org/viewcvs?rev=390749&view=rev
Log:
check if extensionsFilter is correctly configured, else throw an exception as soon as someone tries to access the AddResource stuff

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=390749&r1=390748&r2=390749&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 Sat Apr  1 12:44:22 2006
@@ -59,11 +59,15 @@
     private static final String INIT_PARAM_ADD_RESOURCE_CLASS = "org.apache.myfaces.ADD_RESOURCE_CLASS";
     private static final String INIT_PARAM_ADD_RESOURCE_CLASS_DEFAULT = "org.apache.myfaces.renderkit.html.util.DefaultAddResource";
 
+    private static final String  INIT_CHECK_EXTENSIONS_FILTER = "org.apache.myfaces.CHECK_EXTENSIONS_FILTER";
+    private static final boolean INIT_CHECK_EXTENSIONS_FILTER_DEFAULT = true;
+    
     private boolean _prettyHtml;
     private boolean _detectJavascript;
     private boolean _allowJavascript;
     private boolean _autoScroll;
     private String _addResourceClass;
+    private boolean _checkExtensionsFilter;
 
     public static MyfacesConfig getCurrentInstance(ExternalContext extCtx)
     {
@@ -84,6 +88,12 @@
                                                             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));
+                
         return myfacesConfig;
     }
 
@@ -199,4 +209,17 @@
             return addResourceClass;
         }
     }
+
+    /**
+     * Should the environment be checked so that the ExtensionsFilter will work properly. 
+     */
+	public boolean isCheckExtensionsFilter()
+	{
+		return _checkExtensionsFilter;
+	}
+
+	public void setCheckExtensionsFilter(boolean extensionsFilter)
+	{
+		_checkExtensionsFilter = extensionsFilter;
+	}
 }