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/14 03:04:12 UTC

svn commit: r824992 - in /myfaces/extensions/validator/branches/branch_for_jsf_1_1: core/src/main/java/org/apache/myfaces/extensions/validator/core/ validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interc...

Author: gpetracek
Date: Wed Oct 14 01:04:11 2009
New Revision: 824992

URL: http://svn.apache.org/viewvc?rev=824992&view=rev
Log:
cleanup

Removed:
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/PropertyValidationGroupProvider.java
Modified:
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java

Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java?rev=824992&r1=824991&r2=824992&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java Wed Oct 14 01:04:11 2009
@@ -62,12 +62,6 @@
     private List<ProcessedInformationRecorder> processedInformationRecorders =
         new ArrayList<ProcessedInformationRecorder>();
 
-    private List<ComponentInitializer> componentInitializers;
-    private List<ValidationExceptionInterceptor> validationExceptionInterceptors;
-    private List<PropertyValidationInterceptor> propertyValidationInterceptors;
-    private Map<Class, List<PropertyValidationInterceptor>> moduleSpecificPropertyValidationInterceptors;
-    private List<MetaDataExtractionInterceptor> metaDataExtractionInterceptors;
-
     private SkipValidationEvaluator skipValidationEvaluator;
 
     private Map<String, Object> globalProperties = new HashMap<String, Object>();
@@ -75,6 +69,12 @@
     private Map<StaticConfigurationNames, List<StaticConfiguration<String, String>>> staticConfigMap
         = new HashMap<StaticConfigurationNames, List<StaticConfiguration<String, String>>>();
 
+    //execution order support
+    private List<MetaDataExtractionInterceptor> metaDataExtractionInterceptors;
+    private List<ValidationExceptionInterceptor> validationExceptionInterceptors;
+    private List<PropertyValidationInterceptor> propertyValidationInterceptors;
+    private List<ComponentInitializer> componentInitializers;
+    private Map<Class, List<PropertyValidationInterceptor>> moduleSpecificPropertyValidationInterceptors;
 
     private void lazyInitComponentInitializers()
     {

Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java?rev=824992&r1=824991&r2=824992&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java Wed Oct 14 01:04:11 2009
@@ -55,7 +55,6 @@
     {
         registerValidatorFactory();
         registerBeanValidationInterceptor();
-        registerValidationGroupProvider();
         registerMetaDataTransformerNameMapper();
         registerGroupStorageNameMapper();
         registerModelValidationStorageNameMapper();
@@ -74,12 +73,6 @@
         ExtValContext.getContext().registerRendererInterceptor(new BeanValidationInterceptor());
     }
 
-    @Deprecated
-    protected void registerValidationGroupProvider()
-    {
-        //ExtValContext.getContext().addPropertyValidationInterceptor(new PropertyValidationGroupProvider());
-    }
-
     protected void registerMetaDataTransformerNameMapper()
     {
         ExtValUtils.registerValidationStrategyToMetaDataTransformerNameMapper(new SizeNameMapper());

Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java?rev=824992&r1=824991&r2=824992&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java Wed Oct 14 01:04:11 2009
@@ -34,8 +34,6 @@
 import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfiguration;
 import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
 import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticInMemoryConfiguration;
-import org.apache.myfaces.extensions.validator.internal.ToDo;
-import org.apache.myfaces.extensions.validator.internal.Priority;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import org.apache.myfaces.extensions.validator.internal.UsageCategory;
 import org.apache.myfaces.extensions.validator.crossval.recorder.CrossValidationUserInputRecorder;
@@ -84,13 +82,11 @@
         }
     }
 
-    @ToDo(value = Priority.MEDIUM, description = "web.xml parameter to deactivate it")
     private void initDefaultComponentInitializer()
     {
         ExtValContext.getContext().addComponentInitializer(new HtmlCoreComponentsComponentInitializer());
     }
 
-    @ToDo(value = Priority.MEDIUM, description = "web.xml parameter to deactivate it")
     private void initDefaultValidationExceptionInterceptor()
     {
         ExtValContext.getContext().addValidationExceptionInterceptor(