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 2008/09/29 13:32:04 UTC
svn commit: r700066 [2/2] - in
/myfaces/extensions/validator/branches/jsf_1.1:
component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/startup/
component-support/trinidad-support/src/main/java/org/apache/myfaces/...
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/PatternMetaDataExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/PatternMetaDataExtractor.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/PatternMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/PatternMetaDataExtractor.java Mon Sep 29 04:32:01 2008
@@ -21,8 +21,11 @@
import org.apache.myfaces.extensions.validator.core.metadata.CommonMetaDataKeys;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
+import org.apache.myfaces.extensions.validator.core.validation.message.resolver.MessageResolver;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryNameEnum;
import org.apache.myfaces.extensions.validator.baseval.annotation.Pattern;
-import org.apache.myfaces.extensions.validator.util.FactoryUtils;
import javax.faces.context.FacesContext;
import java.lang.annotation.Annotation;
@@ -44,10 +47,16 @@
String validationErrorMsgKey = ((Pattern)annotation).validationErrorMsgKey();
Locale currentLocale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
- ValidationStrategy validationStrategy = FactoryUtils.getValidationStrategyFactory().create(annotation);
+ ValidationStrategy validationStrategy = ((ClassMappingFactory<Annotation, ValidationStrategy>)ExtValContext
+ .getContext().getFactoryFinder()
+ .getFactory(FactoryNameEnum.VALIDATION_STRATEGY_FACTORY, ClassMappingFactory.class))
+ .create(annotation);
- String validationErrorMsg = FactoryUtils.getMessageResolverFactory()
- .create(validationStrategy).getMessage(validationErrorMsgKey, currentLocale);
+ String validationErrorMsg = ((ClassMappingFactory<ValidationStrategy, MessageResolver>)ExtValContext
+ .getContext()
+ .getFactoryFinder()
+ .getFactory(FactoryNameEnum.MESSAGE_RESOLVER_FACTORY, ClassMappingFactory.class))
+ .create(validationStrategy).getMessage(validationErrorMsgKey, currentLocale);
results.put(CommonMetaDataKeys.PATTERN_VALIDATION_ERROR_MESSAGE, validationErrorMsg);
return results;
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java Mon Sep 29 04:32:01 2008
@@ -24,11 +24,14 @@
import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractor;
import org.apache.myfaces.extensions.validator.core.validation.strategy.AbstractValidatorAdapter;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.util.FactoryUtils;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryNameEnum;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
+import java.lang.annotation.Annotation;
/**
* @author Gerhard Petracek
@@ -51,9 +54,10 @@
for (AnnotationEntry entry : extractor.extractAnnotations(
facesContext, targetExpression))
{
- validationStrategy = FactoryUtils
- .getValidationStrategyFactory().create(
- entry.getAnnotation());
+ validationStrategy = ((ClassMappingFactory<Annotation, ValidationStrategy>) ExtValContext.getContext()
+ .getFactoryFinder()
+ .getFactory(FactoryNameEnum.VALIDATION_STRATEGY_FACTORY, ClassMappingFactory.class))
+ .create(entry.getAnnotation());
if (validationStrategy != null)
{
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java Mon Sep 29 04:32:01 2008
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.crossval;
import org.apache.myfaces.extensions.validator.util.CrossValidationUtils;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.util.JsfUtils;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -102,7 +102,7 @@
&& WebXmlParameter.DEACTIVATE_CROSSVALIDATION
.equalsIgnoreCase("true"))
{
- ExtValUtils.deregisterPhaseListener(this);
+ JsfUtils.deregisterPhaseListener(this);
}
else
{
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java Mon Sep 29 04:32:01 2008
@@ -37,7 +37,7 @@
import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.LocalCompareStrategy;
import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.ReferencingStrategy;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
/**
* @author Gerhard Petracek
@@ -59,9 +59,9 @@
{
referencingStrategies = new ArrayList<ReferencingStrategy>();
- String customReferencingStrategyClassName = ExtValUtils
- .getBasePackage()
- + "ReferencingStrategy";
+ String customReferencingStrategyClassName =
+ ExtValContext.getContext().getInformationProviderBean().getBasePackage() + "ReferencingStrategy";
+
ReferencingStrategy customReferencingStrategy = (ReferencingStrategy) ClassUtils
.tryToInstantiateClassForName(customReferencingStrategyClassName);
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java Mon Sep 29 04:32:01 2008
@@ -56,7 +56,7 @@
.put(CROSS_VALIDATION_STORAGE_KEY, new CrossValidationStorage());
}
- public static final String VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY = ExtValUtils.class.getName();
+ public static final String VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY = JsfUtils.class.getName();
public static Map<String, ProcessedInformationEntry> getOrInitValueBindingConvertedValueMapping()
{