You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/05/04 22:56:34 UTC
svn commit: r941039 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
Author: lu4242
Date: Tue May 4 20:56:34 2010
New Revision: 941039
URL: http://svn.apache.org/viewvc?rev=941039&view=rev
Log:
MYFACES-2697 BeanValidation class is annotated with @FacesValidator tag
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=941039&r1=941038&r2=941039&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Tue May 4 20:56:34 2010
@@ -2000,37 +2000,24 @@ public class FacesConfigurator
application.addValidator(validatorId, dispenser.getValidatorClass(validatorId));
}
+ //
+ if (ExternalSpecifications.isBeanValidationAvailable())
+ {
+ String disabled = _externalContext.getInitParameter(BeanValidator.DISABLE_DEFAULT_BEAN_VALIDATOR_PARAM_NAME);
+ boolean defaultBeanValidatorDisabled = (disabled != null && disabled.toLowerCase().equals("true"));
+ if (!defaultBeanValidatorDisabled)
+ {
+ application.addDefaultValidatorId(BeanValidator.VALIDATOR_ID);
+ }
+ }
+
// only add default validators if there is no empty <default-validators> in faces-config.xml
if (!dispenser.isEmptyDefaultValidators())
{
- boolean beanValidatorAdded = false;
for (String validatorId : dispenser.getDefaultValidatorIds())
{
- if (validatorId.equals(BeanValidator.VALIDATOR_ID))
- {
- if (!ExternalSpecifications.isBeanValidationAvailable())
- {
- // do not add it as a default validator
- continue;
- }
- else
- {
- beanValidatorAdded = true;
- }
- }
application.addDefaultValidatorId(validatorId);
}
-
- // add the bean validator if it is available, not already added and not disabled
- if (!beanValidatorAdded && ExternalSpecifications.isBeanValidationAvailable())
- {
- String disabled = _externalContext.getInitParameter(BeanValidator.DISABLE_DEFAULT_BEAN_VALIDATOR_PARAM_NAME);
- boolean defaultBeanValidatorDisabled = (disabled != null && disabled.toLowerCase().equals("true"));
- if (!defaultBeanValidatorDisabled)
- {
- application.addDefaultValidatorId(BeanValidator.VALIDATOR_ID);
- }
- }
}
for (Behavior behavior : dispenser.getBehaviors()) {