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/10/02 00:58:09 UTC
svn commit: r700968 - in /myfaces/extensions/validator/trunk:
core/src/main/java/org/apache/myfaces/extensions/validator/core/
core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/
core/src/main/java/org/apache/myfaces/extensions/val...
Author: gpetracek
Date: Wed Oct 1 15:58:07 2008
New Revision: 700968
URL: http://svn.apache.org/viewvc?rev=700968&view=rev
Log:
changed names
Added:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/
- copied from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/BeanMetaDataExtractorAdapter.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/BeanMetaDataExtractorAdapterImpl.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultMetaDataExtractorFactory.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataTransformer.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/MetaDataExtractor.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/BeanValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConfiguredValidationStrategyToMetaDataTransformerNameMapper.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConfiguredValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConventionValidationStrategyToMetaDataTransformerNameMapper.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataTransformerNameMapper.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/
- copied from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/DoubleRangeMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JoinMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JpaMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/LengthMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/LongRangeMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/PatternMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/RequiredMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java
- copied, changed from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/ValidatorMetaDataExtractor.java
Removed:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataExtractorAdapter.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataExtractorAdapterImpl.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataExtractorFactory.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataExtractor.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConfiguredValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataExtractor.java
Modified:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.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/factory/DefaultFactoryFinder.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNames.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java?rev=700968&r1=700967&r2=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java Wed Oct 1 15:58:07 2008
@@ -82,9 +82,9 @@
return "ValidationStrategy";
}
- public String getMetaDataExtractorPostfix()
+ public String getMetaDataTransformerPostfix()
{
- return "MetaDataExtractor";
+ return "MetaDataTransformer";
}
/*
@@ -100,9 +100,9 @@
return this.basePackage + "AnnotationToValidationStrategyNameMapper";
}
- public String getCustomValidationStrategyToMetaDataExtractorNameMapper()
+ public String getCustomValidationStrategyToMetaDataTransformerNameMapper()
{
- return this.basePackage + "ValidationStrategyToMetaDataExtractorNameMapper";
+ return this.basePackage + "ValidationStrategyToMetaDataTransformerNameMapper";
}
/*
@@ -146,9 +146,9 @@
return this.basePackage + "AnnotationExtractorFactory";
}
- public String getCustomMetaDataExtractorFactory()
+ public String getCustomMetaDataTransformerFactory()
{
- return this.basePackage + "MetaDataExtractorFactory";
+ return this.basePackage + "MetaDataTransformerFactory";
}
/*
@@ -220,24 +220,25 @@
return getValidationStrategyBasedName(validationStrategyClass, ".message.resolver.", targetClassName);
}
- public final String getConventionNameForMetaDataExtractorName(
+ public final String getConventionNameForMetaDataTransformerName(
Class<? extends ValidationStrategy> validationStrategyClass, String targetClassName)
{
- return getValidationStrategyBasedName(validationStrategyClass, ".metadata.extractor.", targetClassName);
+ return getValidationStrategyBasedName(validationStrategyClass, ".metadata.transformer.", targetClassName);
}
private String getValidationStrategyBasedName(Class<? extends ValidationStrategy> validationStrategyClass,
String targetPackageName, String targetClassName)
{
- String extractorName = validationStrategyClass.getName();
+ String validationStrategyClassName = validationStrategyClass.getName();
- extractorName = extractorName.replace(".strategy.", targetPackageName);
+ validationStrategyClassName = validationStrategyClassName.replace(".strategy.", targetPackageName);
if (targetClassName == null)
{
return null;
}
- return extractorName.substring(0, extractorName.lastIndexOf(".")) + "." + targetClassName;
+ return validationStrategyClassName
+ .substring(0, validationStrategyClassName.lastIndexOf(".")) + "." + targetClassName;
}
/**
@@ -256,9 +257,9 @@
return annotation.annotationType().getName().replace(".annotation.", ".strategy.") + "Strategy";
}
- public final String getConventionNameForMetaDataExtractorClass(String validationStrategyName)
+ public final String getConventionNameForMetaDataTransformerClass(String validationStrategyName)
{
- return getValidationStrategyBasedName(validationStrategyName, "MetaDataExtractor");
+ return getValidationStrategyBasedName(validationStrategyName, "MetaDataTransformer");
}
private String getValidationStrategyBasedName(String validationStrategyName, String targetPostfix)
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=700968&r1=700967&r2=700968&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 Wed Oct 1 15:58:07 2008
@@ -74,11 +74,11 @@
static final String CUSTOM_COMPONENT_INITIALIZER = WebXmlUtils
.getInitParameter("CUSTOM_COMPONENT_INITIALIZER");
- static final String CUSTOM_META_DATA_EXTRACTOR_FACTORY = WebXmlUtils
- .getInitParameter("CUSTOM_META_DATA_EXTRACTOR_FACTORY");
+ static final String CUSTOM_META_DATA_TRANSFORMER_FACTORY = WebXmlUtils
+ .getInitParameter("CUSTOM_META_DATA_TRANSFORMER_FACTORY");
- static final String CUSTOM_VALIDATION_STRATEGY_TO_META_DATA_EXTRACTOR_NAME_MAPPER = WebXmlUtils
- .getInitParameter("CUSTOM_VALIDATION_STRATEGY_TO_META_DATA_EXTRACTOR_NAME_MAPPER");
+ static final String CUSTOM_VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_NAME_MAPPER = WebXmlUtils
+ .getInitParameter("CUSTOM_VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_NAME_MAPPER");
/*
* deactivate
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java?rev=700968&r1=700967&r2=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java Wed Oct 1 15:58:07 2008
@@ -25,7 +25,7 @@
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.renderkit.DefaultRenderKitWrapperFactory;
import org.apache.myfaces.extensions.validator.core.initializer.component.DefaultComponentInitializerFactory;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.DefaultMetaDataExtractorFactory;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.DefaultMetaDataTransformerFactory;
import org.apache.myfaces.extensions.validator.core.validation.strategy.DefaultValidationStrategyFactory;
import org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultMessageResolverFactory;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
@@ -72,8 +72,8 @@
factory = createMessageResolverFactory();
break;
- case META_DATA_EXTRACTOR_FACTORY:
- factory = createMetaDataExtractorFactory();
+ case META_DATA_TRANSFORMER_FACTORY:
+ factory = createMetaDataTransformerFactory();
break;
case COMPONENT_INITIALIZER_FACTORY:
@@ -167,17 +167,17 @@
return factory;
}
- protected Object createMetaDataExtractorFactory()
+ protected Object createMetaDataTransformerFactory()
{
Object factory = null;
- List<String> metaDataExtractorFactoryClassNames = new ArrayList<String>();
+ List<String> metaDataTransformerFactoryClassNames = new ArrayList<String>();
- metaDataExtractorFactoryClassNames.add(WebXmlParameter.CUSTOM_META_DATA_EXTRACTOR_FACTORY);
- metaDataExtractorFactoryClassNames
- .add(ExtValContext.getContext().getInformationProviderBean().getCustomMetaDataExtractorFactory());
- metaDataExtractorFactoryClassNames.add(DefaultMetaDataExtractorFactory.class.getName());
+ metaDataTransformerFactoryClassNames.add(WebXmlParameter.CUSTOM_META_DATA_TRANSFORMER_FACTORY );
+ metaDataTransformerFactoryClassNames
+ .add(ExtValContext.getContext().getInformationProviderBean().getCustomMetaDataTransformerFactory());
+ metaDataTransformerFactoryClassNames.add( DefaultMetaDataTransformerFactory.class.getName());
- for (String className : metaDataExtractorFactoryClassNames)
+ for (String className : metaDataTransformerFactoryClassNames)
{
factory = ClassUtils.tryToInstantiateClassForName(className);
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNames.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNames.java?rev=700968&r1=700967&r2=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNames.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNames.java Wed Oct 1 15:58:07 2008
@@ -27,7 +27,7 @@
COMPONENT_ANNOTATION_EXTRACTOR_FACTORY,
VALIDATION_STRATEGY_FACTORY,
MESSAGE_RESOLVER_FACTORY,
- META_DATA_EXTRACTOR_FACTORY,
+ META_DATA_TRANSFORMER_FACTORY,
COMPONENT_INITIALIZER_FACTORY,
RENDERKIT_WRAPPER_FACTORY
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java?rev=700968&r1=700967&r2=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java Wed Oct 1 15:58:07 2008
@@ -21,7 +21,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractor;
import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractorFactory;
import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
@@ -66,7 +66,7 @@
}
ValidationStrategy validationStrategy;
- MetaDataExtractor metaDataExtractor;
+ MetaDataTransformer metaDataTransformer;
AnnotationExtractor annotationExtractor = ExtValContext.getContext().getFactoryFinder().getFactory(
FactoryNames.COMPONENT_ANNOTATION_EXTRACTOR_FACTORY, AnnotationExtractorFactory.class).create();
@@ -79,11 +79,11 @@
if (validationStrategy != null)
{
- metaDataExtractor = ExtValUtils.getMetaDataExtractorForValidationStrategy(validationStrategy);
+ metaDataTransformer = ExtValUtils.getMetaDataTransformerForValidationStrategy(validationStrategy);
- if(metaDataExtractor != null)
+ if(metaDataTransformer != null)
{
- metaData = metaDataExtractor.extractMetaData(entry.getAnnotation());
+ metaData = metaDataTransformer.extractMetaData(entry.getAnnotation());
}
else
{
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java (from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/BeanMetaDataExtractorAdapter.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/BeanMetaDataExtractorAdapter.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/BeanMetaDataExtractorAdapter.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java Wed Oct 1 15:58:07 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata.extractor;
+package org.apache.myfaces.extensions.validator.core.metadata.transformer;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -34,7 +34,7 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.REUSE})
-public interface BeanMetaDataExtractorAdapter extends MetaDataExtractor
+public interface BeanMetaDataTransformerAdapter extends MetaDataTransformer
{
- String getMetaDataExtractorClassName();
+ String getMetaDataTransformerClassName();
}
\ No newline at end of file
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java (from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/BeanMetaDataExtractorAdapterImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/BeanMetaDataExtractorAdapterImpl.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/BeanMetaDataExtractorAdapterImpl.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java Wed Oct 1 15:58:07 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata.extractor;
+package org.apache.myfaces.extensions.validator.core.metadata.transformer;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -28,7 +28,7 @@
* it's just a helper for proxies - you just need it, if you define the equivalent validation strategy as bean and
* e.g. spring creates a proxy for it.
*
- * if there is also a proxy for the extractor you can use the className property to manually repeat the
+ * if there is also a proxy for the transformer you can use the className property to manually repeat the
* full qualified class name.
*
* @see org.apache.myfaces.extensions.validator.core.validation.strategy.BeanValidationStrategyAdapter
@@ -37,25 +37,25 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.REUSE})
-public class BeanMetaDataExtractorAdapterImpl implements BeanMetaDataExtractorAdapter
+public class BeanMetaDataTransformerAdapterImpl implements BeanMetaDataTransformerAdapter
{
- private MetaDataExtractor metaDataExtractor;
- private String metaDataExtractorClassName;
+ private MetaDataTransformer metaDataTransformer;
+ private String metaDataTransformerClassName;
public Map<String, Object> extractMetaData(Annotation annotation)
{
- return this.metaDataExtractor.extractMetaData(annotation);
+ return this.metaDataTransformer.extractMetaData(annotation);
}
- public String getMetaDataExtractorClassName()
+ public String getMetaDataTransformerClassName()
{
- if(metaDataExtractorClassName != null)
+ if(metaDataTransformerClassName != null)
{
- return metaDataExtractorClassName;
+ return metaDataTransformerClassName;
}
- if(metaDataExtractor.getClass().getPackage() != null)
+ if(metaDataTransformer.getClass().getPackage() != null)
{
- metaDataExtractor.getClass();
+ metaDataTransformer.getClass();
}
return null;
@@ -64,18 +64,18 @@
/*
* generated
*/
- public void setMetaDataExtractorClassName(String metaDataExtractorClassName)
+ public void setMetaDataTransformerClassName(String metaDataTransformerClassName)
{
- this.metaDataExtractorClassName = metaDataExtractorClassName;
+ this.metaDataTransformerClassName = metaDataTransformerClassName;
}
- public MetaDataExtractor getMetaDataExtractor()
+ public MetaDataTransformer getMetaDataTransformer()
{
- return metaDataExtractor;
+ return metaDataTransformer;
}
- public void setMetaDataExtractor(MetaDataExtractor metaDataExtractor)
+ public void setMetaDataTransformer(MetaDataTransformer metaDataTransformer)
{
- this.metaDataExtractor = metaDataExtractor;
+ this.metaDataTransformer = metaDataTransformer;
}
}
\ No newline at end of file
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java (from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultMetaDataExtractorFactory.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultMetaDataExtractorFactory.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultMetaDataExtractorFactory.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java Wed Oct 1 15:58:07 2008
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata.extractor;
+package org.apache.myfaces.extensions.validator.core.metadata.transformer;
import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.validation.strategy.BeanValidationStrategyAdapter;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper
- .CustomConfiguredValidationStrategyToMetaDataExtractorNameMapper;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper
- .CustomConventionValidationStrategyToMetaDataExtractorNameMapper;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper
- .DefaultValidationStrategyToMetaDataExtractorNameMapper;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper
- .SimpleValidationStrategyToMetaDataExtractorNameMapper;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper
- .BeanValidationStrategyToMetaDataExtractorNameMapper;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper
+ .CustomConfiguredValidationStrategyToMetaDataTransformerNameMapper;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper
+ .CustomConventionValidationStrategyToMetaDataTransformerNameMapper;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper
+ .DefaultValidationStrategyToMetaDataTransformerNameMapper;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper
+ .SimpleValidationStrategyToMetaDataTransformerNameMapper;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper
+ .BeanValidationStrategyToMetaDataTransformerNameMapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -45,40 +45,40 @@
/**
- * Factory which creates the MetaDataExtractor for a given ValidationStrategy
+ * Factory which creates the MetaDataTransformer for a given ValidationStrategy
*
* @author Gerhard Petracek
* @since 1.x.1
*/
/*
- * ValidationStrategy -> MetaDataExtractor instead of Annotation -> MetaDataExtractor
+ * ValidationStrategy -> MetaDataTransformer instead of Annotation -> MetaDataTransformer
* to avoid a second static mapping e.g. for jpa annotations
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.CUSTOMIZABLE})
-public class DefaultMetaDataExtractorFactory implements
- ClassMappingFactory<ValidationStrategy, MetaDataExtractor>
+public class DefaultMetaDataTransformerFactory implements
+ ClassMappingFactory<ValidationStrategy, MetaDataTransformer>
{
protected final Log logger = LogFactory.getLog(getClass());
- private static Map<String, String> validationStrategyToMetaDataExtractorMapping = new HashMap<String, String>();
+ private static Map<String, String> validationStrategyToMetaDataTransformerMapping = new HashMap<String, String>();
private static List<NameMapper<ValidationStrategy>> nameMapperList
= new ArrayList<NameMapper<ValidationStrategy>>();
static
{
nameMapperList
- .add(new CustomConfiguredValidationStrategyToMetaDataExtractorNameMapper());
+ .add(new CustomConfiguredValidationStrategyToMetaDataTransformerNameMapper());
nameMapperList
- .add(new CustomConventionValidationStrategyToMetaDataExtractorNameMapper());
+ .add(new CustomConventionValidationStrategyToMetaDataTransformerNameMapper());
nameMapperList
- .add(new DefaultValidationStrategyToMetaDataExtractorNameMapper());
+ .add(new DefaultValidationStrategyToMetaDataTransformerNameMapper());
nameMapperList
- .add(new SimpleValidationStrategyToMetaDataExtractorNameMapper());
+ .add(new SimpleValidationStrategyToMetaDataTransformerNameMapper());
nameMapperList
- .add(new BeanValidationStrategyToMetaDataExtractorNameMapper());
+ .add(new BeanValidationStrategyToMetaDataTransformerNameMapper());
}
- public MetaDataExtractor create(ValidationStrategy validationStrategy)
+ public MetaDataTransformer create(ValidationStrategy validationStrategy)
{
String validationStrategyName = null;
@@ -94,38 +94,38 @@
.getValidationStrategyClassName();
}
- if (validationStrategyToMetaDataExtractorMapping.containsKey(validationStrategyName))
+ if (validationStrategyToMetaDataTransformerMapping.containsKey(validationStrategyName))
{
- return (MetaDataExtractor)ClassUtils.tryToInstantiateClassForName(
- validationStrategyToMetaDataExtractorMapping.get(validationStrategyName));
+ return (MetaDataTransformer)ClassUtils.tryToInstantiateClassForName(
+ validationStrategyToMetaDataTransformerMapping.get(validationStrategyName));
}
- MetaDataExtractor metaDataExtractor;
- String extractorName;
+ MetaDataTransformer metaDataTransformer;
+ String transformerName;
//null -> use name mappers
for (NameMapper<ValidationStrategy> nameMapper : nameMapperList)
{
- extractorName = nameMapper.createName(validationStrategy);
+ transformerName = nameMapper.createName(validationStrategy);
- if (extractorName == null)
+ if (transformerName == null)
{
continue;
}
- metaDataExtractor = (MetaDataExtractor)ClassUtils.tryToInstantiateClassForName(extractorName);
+ metaDataTransformer = (MetaDataTransformer)ClassUtils.tryToInstantiateClassForName(transformerName);
- if (metaDataExtractor != null)
+ if (metaDataTransformer != null)
{
if(validationStrategyName != null)
{
- validationStrategyToMetaDataExtractorMapping.put(validationStrategyName, extractorName);
+ validationStrategyToMetaDataTransformerMapping.put(validationStrategyName, transformerName);
if(logger.isTraceEnabled())
{
- logger.trace(extractorName + " used for " + validationStrategyName);
+ logger.trace(transformerName + " used for " + validationStrategyName);
}
}
- return metaDataExtractor;
+ return metaDataTransformer;
}
}
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataTransformer.java (from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/MetaDataExtractor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataTransformer.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataTransformer.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/MetaDataExtractor.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/MetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataTransformer.java Wed Oct 1 15:58:07 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata.extractor;
+package org.apache.myfaces.extensions.validator.core.metadata.transformer;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -29,7 +29,7 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.API)
-public interface MetaDataExtractor
+public interface MetaDataTransformer
{
Map<String, Object> extractMetaData(Annotation annotation);
}
\ No newline at end of file
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java (from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/BeanValidationStrategyToMetaDataExtractorNameMapper.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/BeanValidationStrategyToMetaDataExtractorNameMapper.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/BeanValidationStrategyToMetaDataExtractorNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java Wed Oct 1 15:58:07 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper;
+package org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
@@ -31,13 +31,13 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.ALTERNATIVE})
-public class BeanValidationStrategyToMetaDataExtractorNameMapper implements NameMapper<ValidationStrategy>
+public class BeanValidationStrategyToMetaDataTransformerNameMapper implements NameMapper<ValidationStrategy>
{
public String createName(ValidationStrategy validationStrategy)
{
if(validationStrategy instanceof BeanValidationStrategyAdapter)
{
- return ((BeanValidationStrategyAdapter)validationStrategy).getMetaDataExtractorClassName();
+ return ((BeanValidationStrategyAdapter)validationStrategy).getMetaDataTransformerClassName();
}
return null;
}
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConfiguredValidationStrategyToMetaDataTransformerNameMapper.java (from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConfiguredValidationStrategyToMetaDataExtractorNameMapper.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConfiguredValidationStrategyToMetaDataTransformerNameMapper.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConfiguredValidationStrategyToMetaDataTransformerNameMapper.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConfiguredValidationStrategyToMetaDataExtractorNameMapper.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConfiguredValidationStrategyToMetaDataExtractorNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConfiguredValidationStrategyToMetaDataTransformerNameMapper.java Wed Oct 1 15:58:07 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper;
+package org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
@@ -25,18 +25,18 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
/**
- * To provide a custom NameMapper to map ValidationStrategies to MetaDataExtractors.
+ * To provide a custom NameMapper to map ValidationStrategies to MetaDataTransformers.
* (configured via web.xml)
*
* @author Gerhard Petracek
* @since 1.x.1
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.CUSTOMIZABLE})
-public class CustomConfiguredValidationStrategyToMetaDataExtractorNameMapper extends
+public class CustomConfiguredValidationStrategyToMetaDataTransformerNameMapper extends
AbstractCustomNameMapper<ValidationStrategy>
{
protected String getCustomNameMapperClassName()
{
- return WebXmlParameter.CUSTOM_VALIDATION_STRATEGY_TO_META_DATA_EXTRACTOR_NAME_MAPPER;
+ return WebXmlParameter.CUSTOM_VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_NAME_MAPPER;
}
}
\ No newline at end of file
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConventionValidationStrategyToMetaDataTransformerNameMapper.java (from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConventionValidationStrategyToMetaDataTransformerNameMapper.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConventionValidationStrategyToMetaDataTransformerNameMapper.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/CustomConventionValidationStrategyToMetaDataTransformerNameMapper.java Wed Oct 1 15:58:07 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper;
+package org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.AbstractCustomNameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
@@ -25,7 +25,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
/**
- * To provide a custom NameMapper to map ValidationStrategies to MetaDataExtractors.
+ * To provide a custom NameMapper to map ValidationStrategies to MetaDataTransformers.
* (configured via information provider bean)
* The bean provides the default name (convention).
* It's possible to provide a custom full qualified name. (= customizable convention)
@@ -34,12 +34,12 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.CUSTOMIZABLE})
-public class CustomConventionValidationStrategyToMetaDataExtractorNameMapper extends
+public class CustomConventionValidationStrategyToMetaDataTransformerNameMapper extends
AbstractCustomNameMapper<ValidationStrategy>
{
protected String getCustomNameMapperClassName()
{
return ExtValContext.getContext().getInformationProviderBean()
- .getCustomValidationStrategyToMetaDataExtractorNameMapper();
+ .getCustomValidationStrategyToMetaDataTransformerNameMapper();
}
}
\ No newline at end of file
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java (from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java Wed Oct 1 15:58:07 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper;
+package org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
@@ -25,25 +25,25 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
/**
- * Default implementation which maps ExtVal ValidationStrategies to MetaDataExtractors.
+ * Default implementation which maps ExtVal ValidationStrategies to MetaDataTransformers.
*
* @author Gerhard Petracek
* @since 1.x.1
*/
@UsageInformation(UsageCategory.INTERNAL)
-public class DefaultValidationStrategyToMetaDataExtractorNameMapper implements
+public class DefaultValidationStrategyToMetaDataTransformerNameMapper implements
NameMapper<ValidationStrategy>
{
public String createName(ValidationStrategy validationStrategy)
{
return ExtValContext.getContext().getInformationProviderBean()
- .getConventionNameForMetaDataExtractorName(
+ .getConventionNameForMetaDataTransformerName(
validationStrategy.getClass(), getClassName(validationStrategy.getClass().getSimpleName()));
}
protected String getClassName(String validationStrategyClassName)
{
return ExtValContext.getContext().getInformationProviderBean()
- .getConventionNameForMetaDataExtractorClass(validationStrategyClassName);
+ .getConventionNameForMetaDataTransformerClass(validationStrategyClassName);
}
}
\ No newline at end of file
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataTransformerNameMapper.java (from r700835, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataTransformerNameMapper.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataTransformerNameMapper.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataTransformerNameMapper.java Wed Oct 1 15:58:07 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper;
+package org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
@@ -25,13 +25,13 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
/**
- * It's an alternative Mapper to place ValidationStrategies and MetaDataExtractors in the same package.
+ * It's an alternative Mapper to place ValidationStrategies and MetaDataTransformers in the same package.
*
* @author Gerhard Petracek
* @since 1.x.1
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.ALTERNATIVE})
-public class SimpleValidationStrategyToMetaDataExtractorNameMapper implements NameMapper<ValidationStrategy>
+public class SimpleValidationStrategyToMetaDataTransformerNameMapper implements NameMapper<ValidationStrategy>
{
public String createName(ValidationStrategy validationStrategy)
{
@@ -39,14 +39,14 @@
{
return null;
}
- return getSimpleMetaDataExtractorName(validationStrategy.getClass().getPackage().getName() + ".",
+ return getSimpleMetaDataTransformerName(validationStrategy.getClass().getPackage().getName() + ".",
validationStrategy.getClass().getSimpleName());
}
- public String getSimpleMetaDataExtractorName(String validationStrategyPackageName,
+ public String getSimpleMetaDataTransformerName(String validationStrategyPackageName,
String validationStrategyClassName)
{
- String postfix = ExtValContext.getContext().getInformationProviderBean().getMetaDataExtractorPostfix();
+ String postfix = ExtValContext.getContext().getInformationProviderBean().getMetaDataTransformerPostfix();
return validationStrategyPackageName + validationStrategyClassName
.replace(ExtValContext.getContext().getInformationProviderBean().getValidationStrategyPostfix(),postfix)
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java?rev=700968&r1=700967&r2=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java Wed Oct 1 15:58:07 2008
@@ -25,7 +25,7 @@
* it's just a helper for proxies - you just need it, if you define the validation strategy as bean and
* e.g. spring creates a proxy for it.
- * adapter to connect validation strategies with meta-data extractors,
+ * adapter to connect validation strategies with meta-data transformers,
* if the validation strategy is defined as bean and e.g. spring creates a proxy
*
* @author Gerhard Petracek
@@ -37,5 +37,5 @@
//to get back the internal cashing
String getValidationStrategyClassName();
- String getMetaDataExtractorClassName();
+ String getMetaDataTransformerClassName();
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java?rev=700968&r1=700967&r2=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java Wed Oct 1 15:58:07 2008
@@ -19,8 +19,8 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy;
import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.BeanMetaDataExtractorAdapter;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.BeanMetaDataTransformerAdapter;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -31,7 +31,7 @@
* it's just a helper for proxies - you just need it, if you define the validation strategy as bean and
* e.g. spring creates a proxy for it.
- * adapter to connect validation strategies with meta-data extractors,
+ * adapter to connect validation strategies with meta-data transformers,
* if the validation strategy is defined as bean and e.g. spring creates a proxy
*
* @author Gerhard Petracek
@@ -40,7 +40,7 @@
@UsageInformation({UsageCategory.REUSE})
public class BeanValidationStrategyAdapterImpl implements BeanValidationStrategyAdapter
{
- private MetaDataExtractor metaDataExtractor;
+ private MetaDataTransformer metaDataTransformer;
private ValidationStrategy validationStrategy;
//optional fallback for internal cashing
private String validationStrategyClassName;
@@ -62,19 +62,19 @@
return validationStrategyClassName;
}
- public String getMetaDataExtractorClassName()
+ public String getMetaDataTransformerClassName()
{
- if(metaDataExtractor != null)
+ if(metaDataTransformer != null)
{
- if(metaDataExtractor.getClass().getPackage() != null)
+ if(metaDataTransformer.getClass().getPackage() != null)
{
- return metaDataExtractor.getClass().getName();
+ return metaDataTransformer.getClass().getName();
}
else
{
- if(metaDataExtractor instanceof BeanMetaDataExtractorAdapter)
+ if(metaDataTransformer instanceof BeanMetaDataTransformerAdapter)
{
- return ((BeanMetaDataExtractorAdapter)metaDataExtractor).getMetaDataExtractorClassName();
+ return ((BeanMetaDataTransformerAdapter) metaDataTransformer ).getMetaDataTransformerClassName();
}
}
}
@@ -84,14 +84,14 @@
/*
* generated
*/
- public MetaDataExtractor getMetaDataExtractor()
+ public MetaDataTransformer getMetaDataTransformer()
{
- return metaDataExtractor;
+ return metaDataTransformer;
}
- public void setMetaDataExtractor(MetaDataExtractor metaDataExtractor)
+ public void setMetaDataTransformer(MetaDataTransformer metaDataTransformer)
{
- this.metaDataExtractor = metaDataExtractor;
+ this.metaDataTransformer = metaDataTransformer;
}
public ValidationStrategy getValidationStrategy()
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java?rev=700968&r1=700967&r2=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java Wed Oct 1 15:58:07 2008
@@ -27,7 +27,7 @@
import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractor;
import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractorFactory;
import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.factory.FactoryNames;
import javax.faces.component.UIComponent;
@@ -50,11 +50,11 @@
.create(annotation);
}
- public static MetaDataExtractor getMetaDataExtractorForValidationStrategy(ValidationStrategy validationStrategy)
+ public static MetaDataTransformer getMetaDataTransformerForValidationStrategy(ValidationStrategy validationStrategy)
{
- return ((ClassMappingFactory<ValidationStrategy, MetaDataExtractor>) ExtValContext
+ return ((ClassMappingFactory<ValidationStrategy, MetaDataTransformer>) ExtValContext
.getContext().getFactoryFinder()
- .getFactory(FactoryNames.META_DATA_EXTRACTOR_FACTORY, ClassMappingFactory.class))
+ .getFactory(FactoryNames.META_DATA_TRANSFORMER_FACTORY, ClassMappingFactory.class))
.create(validationStrategy);
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java?rev=700968&r1=700967&r2=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java Wed Oct 1 15:58:07 2008
@@ -24,14 +24,11 @@
/**
* @author Gerhard Petracek
*/
-public class JpaValidationErrorMessageResolver extends
- AbstractValidationErrorMessageResolver
+public class JpaValidationErrorMessageResolver extends AbstractValidationErrorMessageResolver
{
private static final String CUSTOM_BASE_NAME = WebXmlParameter.VALIDATION_MESSAGES_JPA;
private static final String BASE_NAME = JpaValidationErrorMessageResolver.class
- .getPackage().getName().replace(".message.resolver",
- ".message.bundle")
- + ".jpa_messages";
+ .getPackage().getName().replace(".message.resolver", ".message.bundle")+ ".jpa_messages";
protected String getCustomBaseName()
{
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java (from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/DoubleRangeMetaDataExtractor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/DoubleRangeMetaDataExtractor.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/DoubleRangeMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java Wed Oct 1 15:58:07 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.baseval.metadata.extractor;
+package org.apache.myfaces.extensions.validator.baseval.metadata.transformer;
import org.apache.myfaces.extensions.validator.baseval.annotation.DoubleRange;
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.metadata.transformer.MetaDataTransformer;
import java.lang.annotation.Annotation;
import java.util.HashMap;
@@ -30,7 +30,7 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class DoubleRangeMetaDataExtractor implements MetaDataExtractor
+public class DoubleRangeMetaDataTransformer implements MetaDataTransformer
{
public Map<String, Object> extractMetaData(Annotation annotation)
{
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java (from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JoinMetaDataExtractor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JoinMetaDataExtractor.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JoinMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java Wed Oct 1 15:58:07 2008
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.baseval.metadata.extractor;
+package org.apache.myfaces.extensions.validator.baseval.metadata.transformer;
import org.apache.myfaces.extensions.validator.baseval.annotation.JoinValidation;
import org.apache.myfaces.extensions.validator.baseval.annotation.extractor.DefaultPropertyScanningAnnotationExtractor;
import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractor;
-import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
@@ -35,7 +35,7 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class JoinMetaDataExtractor implements MetaDataExtractor
+public class JoinMetaDataTransformer implements MetaDataTransformer
{
public Map<String, Object> extractMetaData(Annotation annotation)
{
@@ -44,7 +44,7 @@
String[] targetExpressions = ((JoinValidation)annotation).value();
ValidationStrategy validationStrategy;
- MetaDataExtractor metaDataExtractor;
+ MetaDataTransformer metaDataTransformer;
Map<String, Object> results = new HashMap<String, Object>();
@@ -55,11 +55,11 @@
{
validationStrategy = ExtValUtils.getValidationStrategyForAnnotation(entry.getAnnotation());
- metaDataExtractor = ExtValUtils.getMetaDataExtractorForValidationStrategy(validationStrategy);
+ metaDataTransformer = ExtValUtils.getMetaDataTransformerForValidationStrategy(validationStrategy);
- if (metaDataExtractor != null)
+ if (metaDataTransformer != null)
{
- results.putAll(metaDataExtractor.extractMetaData(entry.getAnnotation()));
+ results.putAll( metaDataTransformer.extractMetaData(entry.getAnnotation()));
}
}
}
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java (from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JpaMetaDataExtractor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JpaMetaDataExtractor.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JpaMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java Wed Oct 1 15:58:07 2008
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.baseval.metadata.extractor;
+package org.apache.myfaces.extensions.validator.baseval.metadata.transformer;
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.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.ToDo;
@@ -33,7 +33,7 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class JpaMetaDataExtractor implements MetaDataExtractor
+public class JpaMetaDataTransformer implements MetaDataTransformer
{
@ToDo(value = Priority.HIGH, description = "impl. the rest")
public Map<String, Object> extractMetaData(Annotation annotation)
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java (from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/LengthMetaDataExtractor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/LengthMetaDataExtractor.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/LengthMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java Wed Oct 1 15:58:07 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.baseval.metadata.extractor;
+package org.apache.myfaces.extensions.validator.baseval.metadata.transformer;
import org.apache.myfaces.extensions.validator.baseval.annotation.Length;
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.metadata.transformer.MetaDataTransformer;
import java.lang.annotation.Annotation;
import java.util.HashMap;
@@ -30,7 +30,7 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class LengthMetaDataExtractor implements MetaDataExtractor
+public class LengthMetaDataTransformer implements MetaDataTransformer
{
public Map<String, Object> extractMetaData(Annotation annotation)
{
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java (from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/LongRangeMetaDataExtractor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/LongRangeMetaDataExtractor.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/LongRangeMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java Wed Oct 1 15:58:07 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.baseval.metadata.extractor;
+package org.apache.myfaces.extensions.validator.baseval.metadata.transformer;
import org.apache.myfaces.extensions.validator.baseval.annotation.LongRange;
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.metadata.transformer.MetaDataTransformer;
import java.lang.annotation.Annotation;
import java.util.HashMap;
@@ -30,7 +30,7 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class LongRangeMetaDataExtractor implements MetaDataExtractor
+public class LongRangeMetaDataTransformer implements MetaDataTransformer
{
public Map<String, Object> extractMetaData(Annotation annotation)
{
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java (from r700835, myfaces/extensions/validator/trunk/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/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/PatternMetaDataExtractor.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/PatternMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java Wed Oct 1 15:58:07 2008
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.baseval.metadata.extractor;
+package org.apache.myfaces.extensions.validator.baseval.metadata.transformer;
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.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.baseval.annotation.Pattern;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
@@ -34,7 +34,7 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class PatternMetaDataExtractor implements MetaDataExtractor
+public class PatternMetaDataTransformer implements MetaDataTransformer
{
public Map<String, Object> extractMetaData(Annotation annotation)
{
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java (from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/RequiredMetaDataExtractor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/RequiredMetaDataExtractor.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/RequiredMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java Wed Oct 1 15:58:07 2008
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.baseval.metadata.extractor;
+package org.apache.myfaces.extensions.validator.baseval.metadata.transformer;
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.metadata.transformer.MetaDataTransformer;
import java.lang.annotation.Annotation;
import java.util.HashMap;
@@ -29,7 +29,7 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class RequiredMetaDataExtractor implements MetaDataExtractor
+public class RequiredMetaDataTransformer implements MetaDataTransformer
{
public Map<String, Object> extractMetaData(Annotation annotation)
{
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java (from r700835, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/ValidatorMetaDataExtractor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/ValidatorMetaDataExtractor.java&r1=700835&r2=700968&rev=700968&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/ValidatorMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java Wed Oct 1 15:58:07 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.baseval.metadata.extractor;
+package org.apache.myfaces.extensions.validator.baseval.metadata.transformer;
import org.apache.myfaces.extensions.validator.baseval.annotation.Validator;
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.metadata.transformer.MetaDataTransformer;
import java.lang.annotation.Annotation;
import java.util.HashMap;
@@ -32,7 +32,7 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class ValidatorMetaDataExtractor implements MetaDataExtractor
+public class ValidatorMetaDataTransformer implements MetaDataTransformer
{
public Map<String, Object> extractMetaData(Annotation annotation)
{