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/11/26 11:44:07 UTC
svn commit: r720793 - in /myfaces/extensions/validator/branches/jsf_1.1:
core/src/main/java/org/apache/myfaces/extensions/validator/core/
core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/
core/src/main/java/org/...
Author: gpetracek
Date: Wed Nov 26 02:44:04 2008
New Revision: 720793
URL: http://svn.apache.org/viewvc?rev=720793&view=rev
Log:
changed names
Added:
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfiguration.java
- copied, changed from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfig.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationEntry.java
- copied, changed from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigEntry.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationNames.java
- copied, changed from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigNames.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfiguration.java
- copied, changed from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfig.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfiguration.java
- copied, changed from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfig.java
Removed:
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfig.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigEntry.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigNames.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfig.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfig.java
Modified:
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java?rev=720793&r1=720792&r2=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java Wed Nov 26 02:44:04 2008
@@ -20,14 +20,14 @@
import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
import org.apache.myfaces.extensions.validator.core.initializer.component.DefaultComponentInitializer;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfig;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfiguration;
import org.apache.myfaces.extensions.validator.core.interceptor.RendererInterceptor;
import org.apache.myfaces.extensions.validator.core.interceptor.ValidationExceptionInterceptor;
import org.apache.myfaces.extensions.validator.core.interceptor.DefaultValidationExceptionInterceptor;
import org.apache.myfaces.extensions.validator.core.recorder.ProcessedInformationRecorder;
import org.apache.myfaces.extensions.validator.core.factory.FactoryFinder;
import org.apache.myfaces.extensions.validator.core.factory.DefaultFactoryFinder;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigNames;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
@@ -60,8 +60,8 @@
private Map<String, Object> globalProperties = new HashMap<String, Object>();
- private Map<StaticConfigNames, List<StaticConfig<String, String>>> staticConfigMap
- = new HashMap<StaticConfigNames, List<StaticConfig<String, String>>>();
+ private Map<StaticConfigurationNames, List<StaticConfiguration<String, String>>> staticConfigMap
+ = new HashMap<StaticConfigurationNames, List<StaticConfiguration<String, String>>>();
public static ExtValContext getContext()
{
@@ -195,24 +195,25 @@
}
}
- public List<StaticConfig<String, String>> getStaticConfig(StaticConfigNames name)
+ public List<StaticConfiguration<String, String>> getStaticConfiguration(StaticConfigurationNames name)
{
if(!this.staticConfigMap.containsKey(name))
{
- List<StaticConfig<String, String>> staticConfigList = new ArrayList<StaticConfig<String, String>>();
+ List<StaticConfiguration<String, String>> staticConfigList =
+ new ArrayList<StaticConfiguration<String, String>>();
this.staticConfigMap.put(name, staticConfigList);
}
return this.staticConfigMap.get(name);
}
- public void addStaticConfig(StaticConfigNames name, StaticConfig<String, String> staticConfig)
+ public void addStaticConfiguration(StaticConfigurationNames name, StaticConfiguration<String, String> staticConfig)
{
synchronized (this)
{
- List<StaticConfig<String, String>> staticConfigList;
+ List<StaticConfiguration<String, String>> staticConfigList;
if(!this.staticConfigMap.containsKey(name))
{
- staticConfigList = new ArrayList<StaticConfig<String, String>>();
+ staticConfigList = new ArrayList<StaticConfiguration<String, String>>();
this.staticConfigMap.put(name, staticConfigList);
}
this.staticConfigMap.get(name).add(staticConfig);
Copied: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfiguration.java (from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfig.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfiguration.java?p2=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfiguration.java&p1=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfig.java&r1=720787&r2=720793&rev=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfig.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfiguration.java Wed Nov 26 02:44:04 2008
@@ -28,8 +28,8 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.API)
-public interface StaticConfig<T, R>
+public interface StaticConfiguration<T, R>
{
void setSourceOfMapping(String path);
- List<StaticConfigEntry<T, R>> getMapping();
-}
+ List<StaticConfigurationEntry<T, R>> getMapping();
+}
\ No newline at end of file
Copied: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationEntry.java (from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigEntry.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationEntry.java?p2=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationEntry.java&p1=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigEntry.java&r1=720787&r2=720793&rev=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigEntry.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationEntry.java Wed Nov 26 02:44:04 2008
@@ -26,7 +26,7 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.API)
-public class StaticConfigEntry<T, R>
+public class StaticConfigurationEntry<T, R>
{
private T source;
private R target;
Copied: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationNames.java (from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigNames.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationNames.java?p2=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationNames.java&p1=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigNames.java&r1=720787&r2=720793&rev=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigNames.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticConfigurationNames.java Wed Nov 26 02:44:04 2008
@@ -26,9 +26,9 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.API})
-public enum StaticConfigNames
+public enum StaticConfigurationNames
{
META_DATA_TO_VALIDATION_STRATEGY_CONFIG,
VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_CONFIG,
VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_CONFIG
-}
\ No newline at end of file
+}
Copied: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfiguration.java (from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfig.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfiguration.java?p2=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfiguration.java&p1=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfig.java&r1=720787&r2=720793&rev=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfig.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticInMemoryConfiguration.java Wed Nov 26 02:44:04 2008
@@ -29,25 +29,25 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.REUSE})
-public class StaticInMemoryConfig implements StaticConfig<String, String>
+public class StaticInMemoryConfiguration implements StaticConfiguration<String, String>
{
- private List<StaticConfigEntry<String, String>> mappings
- = new ArrayList<StaticConfigEntry<String, String>>();
+ private List<StaticConfigurationEntry<String, String>> mappings
+ = new ArrayList<StaticConfigurationEntry<String, String>>();
public void setSourceOfMapping(String path)
{
}
- public List<StaticConfigEntry<String, String>> getMapping()
+ public List<StaticConfigurationEntry<String, String>> getMapping()
{
return mappings;
}
public void addMapping(String source, String target)
{
- StaticConfigEntry<String, String> entry = new StaticConfigEntry<String, String>();
+ StaticConfigurationEntry<String, String> entry = new StaticConfigurationEntry<String, String>();
entry.setSource(source);
entry.setTarget(target);
this.mappings.add(entry);
}
-}
\ No newline at end of file
+}
Copied: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfiguration.java (from r720787, myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfig.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfiguration.java?p2=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfiguration.java&p1=myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfig.java&r1=720787&r2=720793&rev=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfig.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/configuration/StaticResourceBundleConfiguration.java Wed Nov 26 02:44:04 2008
@@ -31,10 +31,10 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.REUSE})
-public class StaticResourceBundleConfig implements StaticConfig<String, String>
+public class StaticResourceBundleConfiguration implements StaticConfiguration<String, String>
{
private String path;
- private List<StaticConfigEntry<String, String>> mappings;
+ private List<StaticConfigurationEntry<String, String>> mappings;
public void setSourceOfMapping(String path)
{
@@ -43,21 +43,21 @@
mappings = null;
}
- public List<StaticConfigEntry<String, String>> getMapping()
+ public List<StaticConfigurationEntry<String, String>> getMapping()
{
if(mappings != null)
{
return mappings;
}
- mappings = new ArrayList<StaticConfigEntry<String, String>>();
+ mappings = new ArrayList<StaticConfigurationEntry<String, String>>();
ResourceBundle mapping = ResourceBundle.getBundle(path);
if (mapping == null)
{
//logging
- return new ArrayList<StaticConfigEntry<String, String>>();
+ return new ArrayList<StaticConfigurationEntry<String, String>>();
}
Enumeration keys = mapping.getKeys();
@@ -77,7 +77,7 @@
private void addMapping(String metaDataKey, String validationStrategyClassName)
{
- StaticConfigEntry<String, String> entry = new StaticConfigEntry<String, String>();
+ StaticConfigurationEntry<String, String> entry = new StaticConfigurationEntry<String, String>();
entry.setSource(metaDataKey);
entry.setTarget(validationStrategyClassName);
this.mappings.add(entry);
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java?rev=720793&r1=720792&r2=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java Wed Nov 26 02:44:04 2008
@@ -32,9 +32,9 @@
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.core.initializer.configuration.StaticConfig;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigNames;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigEntry;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfiguration;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationEntry;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -150,18 +150,18 @@
validationStrategyToMetaDataTransformerMapping = new HashMap<String, String>();
//setup internal static mappings
- for (StaticConfig<String, String> staticConfig :
- ExtValContext.getContext().getStaticConfig(
- StaticConfigNames.VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_CONFIG))
+ for (StaticConfiguration<String, String> staticConfig :
+ ExtValContext.getContext().getStaticConfiguration(
+ StaticConfigurationNames.VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_CONFIG))
{
setupStrategyMappings(staticConfig.getMapping());
}
}
}
- private void setupStrategyMappings(List<StaticConfigEntry<String, String>> mappings)
+ private void setupStrategyMappings(List<StaticConfigurationEntry<String, String>> mappings)
{
- for(StaticConfigEntry<String, String> mapping : mappings)
+ for(StaticConfigurationEntry<String, String> mapping : mappings)
{
addMapping(mapping.getSource(), mapping.getTarget());
}
@@ -180,4 +180,4 @@
validationStrategyToMetaDataTransformerMapping.put(validationStrategyName, transformerName);
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java?rev=720793&r1=720792&r2=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java Wed Nov 26 02:44:04 2008
@@ -31,9 +31,9 @@
import org.apache.myfaces.extensions.validator.core.validation.message.
resolver.mapper.SimpleValidationStrategyToMsgResolverNameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfig;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigEntry;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigNames;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfiguration;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationEntry;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
import org.apache.myfaces.extensions.validator.internal.ToDo;
@@ -141,18 +141,18 @@
strategyMessageResolverMapping = new HashMap<String, String>();
//setup internal static mappings
- for (StaticConfig<String, String> staticConfig :
- ExtValContext.getContext().getStaticConfig(
- StaticConfigNames.VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_CONFIG))
+ for (StaticConfiguration<String, String> staticConfig :
+ ExtValContext.getContext().getStaticConfiguration(
+ StaticConfigurationNames.VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_CONFIG))
{
setupStrategyMappings(staticConfig.getMapping());
}
}
}
- private void setupStrategyMappings(List<StaticConfigEntry<String,String>> mappings)
+ private void setupStrategyMappings(List<StaticConfigurationEntry<String,String>> mappings)
{
- for(StaticConfigEntry<String, String> mapping : mappings)
+ for(StaticConfigurationEntry<String, String> mapping : mappings)
{
addMapping(mapping.getSource(), mapping.getTarget());
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java?rev=720793&r1=720792&r2=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java Wed Nov 26 02:44:04 2008
@@ -23,10 +23,10 @@
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInfo;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfig;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigEntry;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigNames;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticResourceBundleConfig;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfiguration;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationEntry;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticResourceBundleConfiguration;
import org.apache.myfaces.extensions.validator.core.validation.strategy.mapper
.AnnotationToValidationStrategyBeanNameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.mapper
@@ -172,14 +172,14 @@
metaDataKeyToValidationStrategyMapping = new HashMap<String, String>();
//setup internal static mappings
- for (StaticConfig<String, String> staticConfig :
- ExtValContext.getContext().getStaticConfig(
- StaticConfigNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG))
+ for (StaticConfiguration<String, String> staticConfig :
+ ExtValContext.getContext().getStaticConfiguration(
+ StaticConfigurationNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG))
{
setupStrategyMappings(staticConfig.getMapping());
}
- StaticConfig<String, String> staticConfig = new StaticResourceBundleConfig();
+ StaticConfiguration<String, String> staticConfig = new StaticResourceBundleConfiguration();
//try to setup mapping with base name by convention - overrides default mapping
try
{
@@ -200,7 +200,7 @@
{
try
{
- staticConfig = new StaticResourceBundleConfig();
+ staticConfig = new StaticResourceBundleConfiguration();
staticConfig.setSourceOfMapping(customMappingBaseName);
setupStrategyMappings(staticConfig.getMapping());
}
@@ -212,9 +212,9 @@
}
}
- private void setupStrategyMappings(List<StaticConfigEntry<String,String>> mappings)
+ private void setupStrategyMappings(List<StaticConfigurationEntry<String,String>> mappings)
{
- for(StaticConfigEntry<String, String> mapping : mappings)
+ for(StaticConfigurationEntry<String, String> mapping : mappings)
{
addMapping(mapping.getSource(), mapping.getTarget());
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java?rev=720793&r1=720792&r2=720793&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java Wed Nov 26 02:44:04 2008
@@ -22,9 +22,9 @@
import org.apache.myfaces.extensions.validator.core.startup.AbstractStartupListener;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.interceptor.ValidationInterceptor;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticResourceBundleConfig;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfig;
-import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigNames;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticResourceBundleConfiguration;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfiguration;
+import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -54,12 +54,12 @@
if (jpaBasedValidation == null
|| !jpaBasedValidation.equalsIgnoreCase("true"))
{
- StaticConfig<String, String> staticConfig = new StaticResourceBundleConfig();
+ StaticConfiguration<String, String> staticConfig = new StaticResourceBundleConfiguration();
staticConfig.setSourceOfMapping(
ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME +".jpa_strategy_mappings");
- ExtValContext.getContext().addStaticConfig(
- StaticConfigNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG, staticConfig);
+ ExtValContext.getContext().addStaticConfiguration(
+ StaticConfigurationNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG, staticConfig);
}
}