You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2009/10/10 00:53:12 UTC

svn commit: r823728 - in /myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core: ExtValContext.java WebXmlParameter.java interceptor/AbstractValidationInterceptor.java

Author: gpetracek
Date: Fri Oct  9 22:53:12 2009
New Revision: 823728

URL: http://svn.apache.org/viewvc?rev=823728&view=rev
Log:
EXTVAL-63 optional web.xml context parameter

Modified:
    myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
    myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java
    myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractValidationInterceptor.java

Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java?rev=823728&r1=823727&r2=823728&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java Fri Oct  9 22:53:12 2009
@@ -384,7 +384,12 @@
     public List<ComponentInitializer> getComponentInitializers()
     {
         lazyInitComponentInitializers();
-        return componentInitializers;
+        return isComponentInitializationActivated() ? componentInitializers : new ArrayList<ComponentInitializer>();
+    }
+
+    private boolean isComponentInitializationActivated()
+    {
+        return !"true".equalsIgnoreCase(WebXmlParameter.DEACTIVATE_COMPONENT_INITIALIZATION);
     }
 
     public void addValidationExceptionInterceptor(ValidationExceptionInterceptor validationExceptionInterceptor)

Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java?rev=823728&r1=823727&r2=823728&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java Fri Oct  9 22:53:12 2009
@@ -123,6 +123,9 @@
     static final String DEACTIVATE_EL_RESOLVER = WebXmlUtils
         .getInitParameter("DEACTIVATE_EL_RESOLVER");
 
+    static final String DEACTIVATE_COMPONENT_INITIALIZATION = WebXmlUtils
+        .getInitParameter("DEACTIVATE_COMPONENT_INITIALIZATION");
+
     //there is nothing like DEACTIVATE_DEFAULT_VALIDATION_INTERCEPTOR
     //use ExtValContext.getContext().denyRendererInterceptor(...) within an extval-StartupListener
 

Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractValidationInterceptor.java?rev=823728&r1=823727&r2=823728&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractValidationInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractValidationInterceptor.java Fri Oct  9 22:53:12 2009
@@ -154,10 +154,11 @@
 
     protected boolean processComponent(UIComponent uiComponent)
     {
-        if (!(uiComponent instanceof EditableValueHolder))
+        if (!(uiComponent instanceof EditableValueHolder) || isComponentInitializationDeactivated())
         {
             return false;
         }
+
         try
         {
             return ExtValUtils.getELHelper().getPropertyDetailsOfValueBinding(uiComponent) != null;
@@ -168,6 +169,11 @@
         }
     }
 
+    private boolean isComponentInitializationDeactivated()
+    {
+        return "true".equalsIgnoreCase(WebXmlParameter.DEACTIVATE_COMPONENT_INITIALIZATION);
+    }
+
     protected boolean recordProcessedInformation()
     {
         //override if needed