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 2010/07/20 23:43:51 UTC
svn commit: r966025 - in
/myfaces/extensions/validator/branches/branch_for_jsf_2_0:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/
core/src/main/java/org/apache/myfaces/extensions/validator/core/
Author: gpetracek
Date: Tue Jul 20 21:43:51 2010
New Revision: 966025
URL: http://svn.apache.org/viewvc?rev=966025&view=rev
Log:
EXTVAL-100 DEACTIVATE_REQUIRED_ATTRIBUTE_SUPPORT config parameter
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java
myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java
myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java?rev=966025&r1=966024&r2=966025&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java Tue Jul 20 21:43:51 2010
@@ -142,13 +142,10 @@ public class TrinidadModuleStartupListen
protected void initRequiredInitialization()
{
- if(!isRequiredInitializationDeactivated())
- {
- ExtValContext.getContext().addGlobalProperty("mode:init:required", Boolean.TRUE, true);
+ ExtValContext.getContext().addGlobalProperty("mode:init:required", Boolean.TRUE, true);
- //there is no support for client-side severity aware validation -> don't reset the value
- ExtValContext.getContext().addGlobalProperty("mode:reset:required", Boolean.FALSE, false);
- }
+ //there is no support for client-side severity aware validation -> don't reset the value
+ ExtValContext.getContext().addGlobalProperty("mode:reset:required", Boolean.FALSE, false);
}
private boolean isRequiredInitializationDeactivated()
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java?rev=966025&r1=966024&r2=966025&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java Tue Jul 20 21:43:51 2010
@@ -219,8 +219,15 @@ public class DefaultExtValCoreConfigurat
public boolean activateRequiredInitialization()
{
+ Boolean globalProperty = (Boolean)ExtValContext.getContext().getGlobalProperty("mode:init:required");
+
+ if(globalProperty != null)
+ {
+ return globalProperty;
+ }
+
return WebXmlParameter.ACTIVATE_REQUIRED_INITIALIZATION != null &&
- "true".equalsIgnoreCase(WebXmlParameter.ACTIVATE_REQUIRED_INITIALIZATION.trim());
+ "true".equalsIgnoreCase(WebXmlParameter.ACTIVATE_REQUIRED_INITIALIZATION);
}
public boolean deactivateDefaultConvention()
@@ -231,7 +238,7 @@ public class DefaultExtValCoreConfigurat
public boolean deactivateDefaultNameMappers()
{
String deactivateDefaultNameMappers = WebXmlParameter.DEACTIVATE_DEFAULT_NAME_MAPPERS;
- return deactivateDefaultNameMappers != null && deactivateDefaultNameMappers.trim().equalsIgnoreCase("true");
+ return deactivateDefaultNameMappers != null && deactivateDefaultNameMappers.equalsIgnoreCase("true");
}
public boolean deactivateElResolver()
@@ -256,7 +263,15 @@ public class DefaultExtValCoreConfigurat
public boolean deactivateRequiredAttributeSupport()
{
- return activateRequiredInitialization();
+ Boolean globalProperty = (Boolean)ExtValContext.getContext().getGlobalProperty("mode:reset:required");
+
+ if(globalProperty != null)
+ {
+ return globalProperty;
+ }
+
+ return WebXmlParameter.DEACTIVATE_REQUIRED_ATTRIBUTE_SUPPORT != null &&
+ "true".equalsIgnoreCase(WebXmlParameter.DEACTIVATE_REQUIRED_ATTRIBUTE_SUPPORT);
}
public boolean interpretEmptyStringSubmittedValuesAsNull()
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java?rev=966025&r1=966024&r2=966025&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java Tue Jul 20 21:43:51 2010
@@ -117,10 +117,13 @@ interface WebXmlParameter
*/
static final String ACTIVATE_REQUIRED_INITIALIZATION = WebXmlUtils
.getInitParameter("ACTIVATE_REQUIRED_INITIALIZATION");
-
+
/*
* deactivate
*/
+ static final String DEACTIVATE_REQUIRED_ATTRIBUTE_SUPPORT = WebXmlUtils
+ .getInitParameter("DEACTIVATE_REQUIRED_ATTRIBUTE_SUPPORT");
+
//currently just used by AbstractValidationErrorMessageResolver
static final String DEACTIVATE_DEFAULT_CONVENTION = WebXmlUtils
.getInitParameter("DEACTIVATE_DEFAULT_CONVENTION");