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/07 11:54:52 UTC
svn commit: r702417 - 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/interceptor/
core/src/main/java/org/apache/myfaces/extensions...
Author: gpetracek
Date: Tue Oct 7 02:54:51 2008
New Revision: 702417
URL: http://svn.apache.org/viewvc?rev=702417&view=rev
Log:
unified names, concepts
Modified:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInfo.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
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/InternalConventionProvider.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/interceptor/ValidationInterceptor.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/AbstractMetaDataTransformer.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataTransformer.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataTransformerNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConfiguredValidationStrategyToMsgResolverNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/SimpleValidationStrategyToMsgResolverNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/ValidationStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInfo.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInfo.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInfo.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInfo.java Tue Oct 7 02:54:51 2008
@@ -32,6 +32,7 @@
COMPONENT_ANNOTATION_EXTRACTOR,
VALIDATION_STRATEGY_POSTFIX,
+ VALIDATION_ERROR_MESSAGE_RESOLVER_POSTFIX,
META_DATA_TRANSFORMER_POSTFIX,
VALIDATION_STRATEGY_TO_MSG_RESOLVER_NAME_MAPPER,
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java Tue Oct 7 02:54:51 2008
@@ -150,9 +150,8 @@
{
List<String> informationProviderBeanClassNames = new ArrayList<String>();
- informationProviderBeanClassNames.add(WebXmlParameter.CUSTOM_CONVENTION_INFO_PROVIDER_BEAN);
- informationProviderBeanClassNames.add(getCustomInformationProviderBeanClassName());
- informationProviderBeanClassNames.add(InformationProviderBean.class.getName());
+ informationProviderBeanClassNames.add(WebXmlParameter.CUSTOM_INFORMATION_PROVIDER_BEAN);
+ informationProviderBeanClassNames.add(InformationProviderBean.CUSTOM_BEAN);
InformationProviderBean informationProviderBean;
for (String className : informationProviderBeanClassNames)
@@ -165,15 +164,25 @@
return informationProviderBean;
}
}
- throw new IllegalStateException(InformationProviderBean.class.getName() + " not found");
+
+ tryToInitCustomConfiguredInformationProviderBeanClassName(applicationMap);
+
+ if(applicationMap.containsKey(InformationProviderBean.BEAN_NAME))
+ {
+ return (InformationProviderBean)applicationMap.get(InformationProviderBean.BEAN_NAME);
+ }
+ return new InformationProviderBean();
}
- private String getCustomInformationProviderBeanClassName()
+ private void tryToInitCustomConfiguredInformationProviderBeanClassName(Map applicationMap)
{
InformationProviderBean bean = (InformationProviderBean) ExtValUtils.getELHelper()
- .getBean(InformationProviderBean.CUSTOM_BEAN);
+ .getBean(InformationProviderBean.CUSTOM_BEAN.replace(".", "_"));
- return (bean != null) ? bean.getClass().getName() : null;
+ if(bean != null)
+ {
+ applicationMap.put(InformationProviderBean.BEAN_NAME, bean);
+ }
}
public List<String> getStaticStrategyMappingSources()
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=702417&r1=702416&r2=702417&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 Tue Oct 7 02:54:51 2008
@@ -46,7 +46,7 @@
+ "." + InformationProviderBean.class.getSimpleName();
//custom class which is an optional replacement for this class (has to extend this class)
public static final String CUSTOM_BEAN = (ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME
- + ".custom." + InformationProviderBean.class.getSimpleName()).replace(".", "_");
+ + ".custom." + InformationProviderBean.class.getSimpleName());
public InformationProviderBean()
{
@@ -63,7 +63,7 @@
private void setupCustomizableInformation()
{
- String basePackage = WebXmlParameter.CUSTOM_EXTENSION_BASE_PACKAGE;
+ String basePackage = WebXmlParameter.CUSTOM_BASE_PACKAGE;
if (basePackage == null)
{
@@ -80,6 +80,9 @@
customizableInfos.put(CustomInfo.VALIDATION_STRATEGY_POSTFIX, "ValidationStrategy");
customizableInfos.put(CustomInfo.META_DATA_TRANSFORMER_POSTFIX, "MetaDataTransformer");
+ customizableInfos.put(CustomInfo.VALIDATION_ERROR_MESSAGE_RESOLVER_POSTFIX, "ValidationErrorMessageResolver");
+
+ customizableInfos.put(CustomInfo.COMPONENT_INITIALIZER, "ComponentInitializer");
customizableInfos.put(CustomInfo.VALIDATION_STRATEGY_TO_MSG_RESOLVER_NAME_MAPPER,
"ValidationStrategyToMsgResolverNameMapper");
@@ -89,7 +92,6 @@
"ValidationStrategyToMetaDataTransformerNameMapper");
customizableInfos.put(CustomInfo.STARTUP_LISTENER, "StartupListener");
- customizableInfos.put(CustomInfo.COMPONENT_INITIALIZER, "ComponentInitializer");
customizableInfos.put(CustomInfo.MESSAGE_RESOLVER_FACTORY, "MessageResolverFactory");
customizableInfos.put(CustomInfo.VALIDATION_STRATEGY_FACTORY, "ValidationStrategyFactory");
@@ -126,6 +128,9 @@
case VALIDATION_STRATEGY_POSTFIX:
return value;
+ case VALIDATION_ERROR_MESSAGE_RESOLVER_POSTFIX:
+ return value;
+
case META_DATA_TRANSFORMER_POSTFIX:
return value;
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InternalConventionProvider.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InternalConventionProvider.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InternalConventionProvider.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InternalConventionProvider.java Tue Oct 7 02:54:51 2008
@@ -100,7 +100,7 @@
return getValidationStrategyBasedName(validationStrategyName, "MetaDataTransformer");
}
- private static String getValidationStrategyBasedName(String validationStrategyName, String targetPostfix)
+ public static String getValidationStrategyBasedName(String validationStrategyName, String targetPostfix)
{
if (validationStrategyName.endsWith("ValidationStrategy"))
{
@@ -110,6 +110,6 @@
{
return validationStrategyName.substring(0, validationStrategyName.length() - 8) + targetPostfix;
}
- return null;
+ return validationStrategyName + targetPostfix;
}
}
\ No newline at end of file
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=702417&r1=702416&r2=702417&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 Tue Oct 7 02:54:51 2008
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.core;
-import org.apache.myfaces.extensions.validator.internal.Priority;
-import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.util.WebXmlUtils;
@@ -34,51 +32,55 @@
public interface WebXmlParameter
{
/*
- * custom
+ * misc
*/
static final String CUSTOM_MESSAGE_BUNDLE = WebXmlUtils
.getInitParameter("CUSTOM_MESSAGE_BUNDLE");
- static final String CUSTOM_EXTENSION_BASE_PACKAGE = WebXmlUtils
- .getInitParameter("CUSTOM_BASE_PACKAGE");
- static final String CUSTOM_CONVENTION_INFO_PROVIDER_BEAN = WebXmlUtils
- .getInitParameter("CUSTOM_INFORMATION_PROVIDER_BEAN");
- static final String CUSTOM_STRATEGY_TO_MESSAGE_RESOLVER_NAME_MAPPER = WebXmlUtils
- .getInitParameter("CUSTOM_STRATEGY_TO_MESSAGE_RESOLVER_NAME_MAPPER");
- static final String CUSTOM_ANNOTATION_TO_VALIDATION_STRATEGY_NAME_MAPPER = WebXmlUtils
- .getInitParameter("CUSTOM_ANNOTATION_TO_VALIDATION_STRATEGY_NAME_MAPPER");
+ static final String CUSTOM_BASE_PACKAGE = WebXmlUtils
+ .getInitParameter("CUSTOM_BASE_PACKAGE");
- static final String CUSTOM_MESSAGE_RESOLVER_FACTORY = WebXmlUtils
- .getInitParameter("CUSTOM_MESSAGE_RESOLVER_FACTORY");
- static final String CUSTOM_VALIDATION_STRATEGY_FACTORY = WebXmlUtils
- .getInitParameter("CUSTOM_VALIDATION_STRATEGY_FACTORY");
- static final String CUSTOM_COMPONENT_ANNOTATION_EXTRACTOR_FACTORY = WebXmlUtils
- .getInitParameter("CUSTOM_COMPONENT_ANNOTATION_EXTRACTOR_FACTORY");
+ static final String CUSTOM_INFORMATION_PROVIDER_BEAN = WebXmlUtils
+ .getInitParameter("CUSTOM_INFORMATION_PROVIDER_BEAN");
static final String CUSTOM_COMPONENT_ANNOTATION_EXTRACTOR = WebXmlUtils
.getInitParameter("CUSTOM_COMPONENT_ANNOTATION_EXTRACTOR");
- @ToDo(value = Priority.MEDIUM, description = "documentation")
- static final String CUSTOM_VALIDATIONSTRATEGY_MAPPING = WebXmlUtils
- .getInitParameter("CUSTOM_STATIC_VALIDATIONSTRATEGY_MAPPING");
+ static final String CUSTOM_STATIC_VALIDATION_STRATEGY_MAPPING = WebXmlUtils
+ .getInitParameter("CUSTOM_STATIC_VALIDATION_STRATEGY_MAPPING");
- static final String CUSTOM_RENDERING_CONTEXT_INITIALIZER_FACTORY = WebXmlUtils
- .getInitParameter("CUSTOM_RENDERING_CONTEXT_INITIALIZER_FACTORY");
+ static final String CUSTOM_COMPONENT_INITIALIZER = WebXmlUtils
+ .getInitParameter("CUSTOM_COMPONENT_INITIALIZER");
- static final String CUSTOM_RENDERING_CONTEXT_INITIALIZER = WebXmlUtils
- .getInitParameter("CUSTOM_RENDERING_CONTEXT_INITIALIZER");
+ /*
+ * name mapper
+ */
+ static final String CUSTOM_VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_NAME_MAPPER = WebXmlUtils
+ .getInitParameter("CUSTOM_VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_NAME_MAPPER");
- static final String CUSTOM_COMPONENT_INITIALIZER_FACTORY = WebXmlUtils
- .getInitParameter("CUSTOM_COMPONENT_INITIALIZER_FACTORY");
+ static final String CUSTOM_ANNOTATION_TO_VALIDATION_STRATEGY_NAME_MAPPER = WebXmlUtils
+ .getInitParameter("CUSTOM_ANNOTATION_TO_VALIDATION_STRATEGY_NAME_MAPPER");
- static final String CUSTOM_COMPONENT_INITIALIZER = WebXmlUtils
- .getInitParameter("CUSTOM_COMPONENT_INITIALIZER");
+ static final String CUSTOM_VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_NAME_MAPPER = WebXmlUtils
+ .getInitParameter("CUSTOM_VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_NAME_MAPPER");
+
+ /*
+ * factories
+ */
+ static final String CUSTOM_VALIDATION_STRATEGY_FACTORY = WebXmlUtils
+ .getInitParameter("CUSTOM_VALIDATION_STRATEGY_FACTORY");
+
+ static final String CUSTOM_MESSAGE_RESOLVER_FACTORY = WebXmlUtils
+ .getInitParameter("CUSTOM_MESSAGE_RESOLVER_FACTORY");
+
+ static final String CUSTOM_COMPONENT_ANNOTATION_EXTRACTOR_FACTORY = WebXmlUtils
+ .getInitParameter("CUSTOM_COMPONENT_ANNOTATION_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_TRANSFORMER_NAME_MAPPER = WebXmlUtils
- .getInitParameter("CUSTOM_VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_NAME_MAPPER");
+ static final String CUSTOM_COMPONENT_INITIALIZER_FACTORY = WebXmlUtils
+ .getInitParameter("CUSTOM_COMPONENT_INITIALIZER_FACTORY");
/*
* deactivate
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=702417&r1=702416&r2=702417&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 Tue Oct 7 02:54:51 2008
@@ -83,7 +83,7 @@
if(metaDataTransformer != null)
{
- metaData = metaDataTransformer.extractMetaData(entry.getAnnotation());
+ metaData = metaDataTransformer.convertMetaData(entry.getAnnotation());
}
else
{
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/AbstractMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/AbstractMetaDataTransformer.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/AbstractMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/AbstractMetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -47,7 +47,7 @@
}
}
- public final Map<String, Object> extractMetaData(Annotation annotation)
+ public final Map<String, Object> convertMetaData(Annotation annotation)
{
if(skipValidation(annotation))
{
@@ -60,7 +60,7 @@
return results;
}
- return processExtraction(annotation);
+ return convert(annotation);
}
protected boolean skipValidation(Annotation annotation)
@@ -93,5 +93,5 @@
return new ArrayList<String>();
}
- protected abstract Map<String, Object> processExtraction(Annotation annotation);
+ protected abstract Map<String, Object> convert(Annotation annotation);
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java Tue Oct 7 02:54:51 2008
@@ -48,13 +48,13 @@
private MetaDataTransformer metaDataTransformer;
private String metaDataTransformerClassName;
- public Map<String, Object> processExtraction(Annotation annotation)
+ public Map<String, Object> convert(Annotation annotation)
{
if(this.metaDataTransformer instanceof AbstractMetaDataTransformer)
{
- return ((AbstractMetaDataTransformer)this.metaDataTransformer).processExtraction(annotation);
+ return ((AbstractMetaDataTransformer)this.metaDataTransformer).convert(annotation);
}
- return this.metaDataTransformer.extractMetaData(annotation);
+ return this.metaDataTransformer.convertMetaData(annotation);
}
@Override
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataTransformer.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/MetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -29,7 +29,8 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.API)
+//*Transformer instead of *Converter to avoid naming confusion
public interface MetaDataTransformer
{
- Map<String, Object> extractMetaData(Annotation annotation);
+ Map<String, Object> convertMetaData(Annotation annotation);
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataTransformerNameMapper.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataTransformerNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/SimpleValidationStrategyToMetaDataTransformerNameMapper.java Tue Oct 7 02:54:51 2008
@@ -61,7 +61,7 @@
}
//in case of a static validation strategy mapping
- return validationStrategyClassName + postfix;
+ return validationStrategyPackageName + validationStrategyClassName + postfix;
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java Tue Oct 7 02:54:51 2008
@@ -24,6 +24,7 @@
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInfo;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
+import org.apache.myfaces.extensions.validator.ExtValInformation;
/**
* @author Gerhard Petracek
@@ -34,6 +35,11 @@
{
protected void init()
{
+ if(logger.isInfoEnabled())
+ {
+ logger.info("starting up MyFaces Extensions Validator v" + ExtValInformation.VERSION);
+ }
+
ExtValContext.getContext().registerRendererInterceptor(new ValidationInterceptor());
executeCustomStartupListener();
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java Tue Oct 7 02:54:51 2008
@@ -102,7 +102,7 @@
resolverName = nameMapper.createName(validationStrategy);
//name wasn't mapped
- if (validationStrategy.getClass().getName().equals(resolverName))
+ if (resolverName == null || validationStrategy.getClass().getName().equals(resolverName))
{
continue;
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConfiguredValidationStrategyToMsgResolverNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConfiguredValidationStrategyToMsgResolverNameMapper.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConfiguredValidationStrategyToMsgResolverNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConfiguredValidationStrategyToMsgResolverNameMapper.java Tue Oct 7 02:54:51 2008
@@ -38,6 +38,6 @@
protected String getCustomNameMapperClassName()
{
- return WebXmlParameter.CUSTOM_STRATEGY_TO_MESSAGE_RESOLVER_NAME_MAPPER;
+ return WebXmlParameter.CUSTOM_VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_NAME_MAPPER;
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/SimpleValidationStrategyToMsgResolverNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/SimpleValidationStrategyToMsgResolverNameMapper.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/SimpleValidationStrategyToMsgResolverNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/SimpleValidationStrategyToMsgResolverNameMapper.java Tue Oct 7 02:54:51 2008
@@ -18,7 +18,9 @@
*/
package org.apache.myfaces.extensions.validator.core.validation.message.resolver.mapper;
-import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.CustomInfo;
+import org.apache.myfaces.extensions.validator.core.InternalConventionProvider;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -30,12 +32,12 @@
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.ALTERNATIVE})
public class SimpleValidationStrategyToMsgResolverNameMapper extends
- AbstractValidationStrategyToMsgResolverNameMapper
+ DefaultValidationStrategyToMsgResolverNameMapper
{
- public String createName(ValidationStrategy validationStrategy)
+ protected String getClassName(String strategyClassName)
{
- String resolverName = validationStrategy.getClass().getName();
-
- return resolverName.substring(0, resolverName.lastIndexOf(".")) + ".DefaultValidationErrorMessageResolver";
+ String customPostfix = ExtValContext.getContext().getInformationProviderBean()
+ .get(CustomInfo.VALIDATION_ERROR_MESSAGE_RESOLVER_POSTFIX);
+ return InternalConventionProvider.getValidationStrategyBasedName(strategyClassName, customPostfix);
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java Tue Oct 7 02:54:51 2008
@@ -187,7 +187,7 @@
}
//setup custom mapping - overrides all other mappings
- String customMappingBaseName = WebXmlParameter.CUSTOM_VALIDATIONSTRATEGY_MAPPING;
+ String customMappingBaseName = WebXmlParameter.CUSTOM_STATIC_VALIDATION_STRATEGY_MAPPING;
if (customMappingBaseName != null)
{
try
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/ValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/ValidationStrategy.java?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/ValidationStrategy.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/ValidationStrategy.java Tue Oct 7 02:54:51 2008
@@ -32,6 +32,7 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.API)
+//*ValidationStrategy instead of *Validator to avoid naming confusion
public interface ValidationStrategy
{
void validate(FacesContext facesContext, UIComponent uiComponent,
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -32,7 +32,7 @@
*/
public class DoubleRangeMetaDataTransformer extends AbstractMetaDataTransformer
{
- public Map<String, Object> processExtraction(Annotation annotation)
+ public Map<String, Object> convert(Annotation annotation)
{
Map<String, Object> results = new HashMap<String, Object>();
double minimum = ((DoubleRange)annotation).minimum();
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -38,7 +38,7 @@
*/
public class JoinMetaDataTransformer extends AbstractMetaDataTransformer
{
- public Map<String, Object> processExtraction(Annotation annotation)
+ public Map<String, Object> convert(Annotation annotation)
{
AnnotationExtractor extractor = new DefaultPropertyScanningAnnotationExtractor();
@@ -60,7 +60,7 @@
if (metaDataTransformer != null)
{
- results.putAll( metaDataTransformer.extractMetaData(entry.getAnnotation()));
+ results.putAll( metaDataTransformer.convertMetaData(entry.getAnnotation()));
}
}
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -36,7 +36,7 @@
public class JpaMetaDataTransformer implements MetaDataTransformer
{
@ToDo(value = Priority.HIGH, description = "impl. the rest")
- public Map<String, Object> extractMetaData(Annotation annotation)
+ public Map<String, Object> convertMetaData(Annotation annotation)
{
Map<String, Object> results = new HashMap<String, Object>();
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -32,7 +32,7 @@
*/
public class LengthMetaDataTransformer extends AbstractMetaDataTransformer
{
- public Map<String, Object> processExtraction(Annotation annotation)
+ public Map<String, Object> convert(Annotation annotation)
{
Map<String, Object> results = new HashMap<String, Object>();
int minimum = ((Length)annotation).minimum();
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -32,7 +32,7 @@
*/
public class LongRangeMetaDataTransformer extends AbstractMetaDataTransformer
{
- public Map<String, Object> processExtraction(Annotation annotation)
+ public Map<String, Object> convert(Annotation annotation)
{
Map<String, Object> results = new HashMap<String, Object>();
long minimum = ((LongRange)annotation).minimum();
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -36,7 +36,7 @@
*/
public class PatternMetaDataTransformer extends AbstractMetaDataTransformer
{
- public Map<String, Object> processExtraction(Annotation annotation)
+ public Map<String, Object> convert(Annotation annotation)
{
Map<String, Object> results = new HashMap<String, Object>();
results.put(CommonMetaDataKeys.PATTERN, ((Pattern)annotation).value());
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -34,7 +34,7 @@
*/
public class RequiredMetaDataTransformer extends AbstractMetaDataTransformer
{
- public Map<String, Object> processExtraction(Annotation annotation)
+ public Map<String, Object> convert(Annotation annotation)
{
Map<String, Object> results = new HashMap<String, Object>();
results.put(CommonMetaDataKeys.WEAK_REQUIRED, true);
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.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?rev=702417&r1=702416&r2=702417&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java Tue Oct 7 02:54:51 2008
@@ -34,7 +34,7 @@
*/
public class ValidatorMetaDataTransformer extends AbstractMetaDataTransformer
{
- public Map<String, Object> processExtraction(Annotation annotation)
+ public Map<String, Object> convert(Annotation annotation)
{
Map<String, Object> results = new HashMap<String, Object>();
Class[] validators = ((Validator)annotation).value();