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/25 01:19:52 UTC
svn commit: r720363 - 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/el/
core/src/main/java/org/apache/myfaces/extensions/validato...
Author: gpetracek
Date: Mon Nov 24 16:19:51 2008
New Revision: 720363
URL: http://svn.apache.org/viewvc?rev=720363&view=rev
Log:
changed names
Added:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfig.java
- copied, changed from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigLoader.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigEntry.java
- copied, changed from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigEntry.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigNames.java
- copied, changed from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigLoaderNames.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticInMemoryConfig.java
- copied, changed from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticInMemoryMappingConfig.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticResourceBundleConfig.java
- copied, changed from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticResourceBundleLoader.java
Removed:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/
Modified:
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/el/DefaultELHelper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelperFactory.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.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/strategy/DefaultValidationStrategyFactory.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/PropertyValidationModuleStartupListener.java
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=720363&r1=720362&r2=720363&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 Mon Nov 24 16:19:51 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.config.StaticConfig;
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.loader.StaticMappingConfigLoader;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigLoaderNames;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfigNames;
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,9 +60,8 @@
private Map<String, Object> globalProperties = new HashMap<String, Object>();
- private Map<StaticMappingConfigLoaderNames, List<StaticMappingConfigLoader<String, String>>>
- staticMappingConfigLoaderMap
- = new HashMap<StaticMappingConfigLoaderNames, List<StaticMappingConfigLoader<String, String>>>();
+ private Map<StaticConfigNames, List<StaticConfig<String, String>>> staticConfigMap
+ = new HashMap<StaticConfigNames, List<StaticConfig<String, String>>>();
public static ExtValContext getContext()
{
@@ -196,30 +195,27 @@
}
}
- public List<StaticMappingConfigLoader<String, String>> getStaticMappingConfigLoaders(
- StaticMappingConfigLoaderNames name)
+ public List<StaticConfig<String, String>> getStaticConfig(StaticConfigNames name)
{
- if(!this.staticMappingConfigLoaderMap.containsKey(name))
+ if(!this.staticConfigMap.containsKey(name))
{
- List<StaticMappingConfigLoader<String, String>> staticMappingConfigLoaderList
- = new ArrayList<StaticMappingConfigLoader<String, String>>();
- this.staticMappingConfigLoaderMap.put(name, staticMappingConfigLoaderList);
+ List<StaticConfig<String, String>> staticConfigList = new ArrayList<StaticConfig<String, String>>();
+ this.staticConfigMap.put(name, staticConfigList);
}
- return this.staticMappingConfigLoaderMap.get(name);
+ return this.staticConfigMap.get(name);
}
- public void addStaticMappingConfigLoader(StaticMappingConfigLoaderNames name, StaticMappingConfigLoader<String,
- String> staticMappingConfigLoader)
+ public void addStaticConfig(StaticConfigNames name, StaticConfig<String, String> staticConfig)
{
synchronized (this)
{
- List<StaticMappingConfigLoader<String, String>> staticMappingConfigLoaderList;
- if(!this.staticMappingConfigLoaderMap.containsKey(name))
+ List<StaticConfig<String, String>> staticConfigList;
+ if(!this.staticConfigMap.containsKey(name))
{
- staticMappingConfigLoaderList = new ArrayList<StaticMappingConfigLoader<String, String>>();
- this.staticMappingConfigLoaderMap.put(name, staticMappingConfigLoaderList);
+ staticConfigList = new ArrayList<StaticConfig<String, String>>();
+ this.staticConfigMap.put(name, staticConfigList);
}
- this.staticMappingConfigLoaderMap.get(name).add(staticMappingConfigLoader);
+ this.staticConfigMap.get(name).add(staticConfig);
}
}
@@ -238,7 +234,10 @@
}
else
{
- logger.warn("override global property '" + name + "'");
+ if(this.logger.isInfoEnabled())
+ {
+ logger.info("override global property '" + name + "'");
+ }
}
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java?rev=720363&r1=720362&r2=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java Mon Nov 24 16:19:51 2008
@@ -65,8 +65,7 @@
}
}
- public Class getTypeOfValueBindingForExpression(FacesContext facesContext,
- ValueBindingExpression valueBindingExpression)
+ public Class getTypeOfExpression(FacesContext facesContext, ValueBindingExpression valueBindingExpression)
{
//due to a restriction with the ri
Object bean = getValueOfExpression(facesContext, valueBindingExpression);
@@ -79,22 +78,6 @@
return facesContext.getApplication().getELResolver().getValue(facesContext.getELContext(), null, beanName);
}
- @ToDo(value = Priority.MEDIUM, description = "refactor - problem - static values - jsf 1.2 e.g.: ${value}")
- public Object getBaseObject(ValueBindingExpression valueBindingExpression, UIComponent uiComponent)
- {
- if(valueBindingExpression.getBaseExpression() == null)
- {
- return uiComponent.getValueExpression("value").getValue(FacesContext.getCurrentInstance().getELContext());
- }
- return getBaseObject(valueBindingExpression);
- }
-
- public Object getBaseObject(ValueBindingExpression valueBindingExpression)
- {
- return getValueOfExpression(FacesContext.getCurrentInstance(),
- valueBindingExpression.getBaseExpression());
- }
-
public Object getValueOfExpression(FacesContext facesContext,
ValueBindingExpression valueBindingExpression)
{
@@ -132,7 +115,7 @@
valueBindingExpression = valueBindingExpression.replace(" ", "");
}
- if (getTypeOfValueBindingForExpression(FacesContext.getCurrentInstance(),
+ if (getTypeOfExpression(FacesContext.getCurrentInstance(),
new ValueBindingExpression(valueBindingExpression).getBaseExpression()) == null)
{
ValueBindingExpression result = FaceletsTaglibExpressionHelper.
@@ -148,7 +131,7 @@
}
Class entityClass = ExtValUtils.getELHelper()
- .getTypeOfValueBindingForExpression(FacesContext.getCurrentInstance(), result.getBaseExpression());
+ .getTypeOfExpression(FacesContext.getCurrentInstance(), result.getBaseExpression());
if(entityClass == null)
{
@@ -233,8 +216,9 @@
path = currentValueBindingExpression.getProperty() + "." + path;
- return new PropertyDetails(path,
- getBaseObject(valueBindingExpression), valueBindingExpression.getProperty());
+ Object baseObject = getValueOfExpression(
+ FacesContext.getCurrentInstance(), valueBindingExpression.getBaseExpression());
+ return new PropertyDetails(path, baseObject, valueBindingExpression.getProperty());
}
static String getOriginalValueBindingExpression(UIComponent uiComponent)
@@ -244,13 +228,6 @@
return (valueExpression != null) ? valueExpression.getExpressionString() : null;
}
- public Class getTypeOfValueBindingForComponent(FacesContext facesContext, UIComponent uiComponent)
- {
- ValueExpression valueExpression = uiComponent.getValueExpression("value");
-
- return (valueExpression != null) ? valueExpression.getType(facesContext.getELContext()) : null;
- }
-
public boolean isELTerm(Object o)
{
if (o instanceof ValueBinding || o instanceof Externalizable)
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelperFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelperFactory.java?rev=720363&r1=720362&r2=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelperFactory.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelperFactory.java Mon Nov 24 16:19:51 2008
@@ -28,14 +28,10 @@
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultELHelperFactory extends AbstractELHelperFactory
{
- private ELHelper elHelper;
+ private ELHelper elHelper = new DefaultELHelper();
protected ELHelper createELHelper()
{
- if(this.elHelper == null)
- {
- this.elHelper = new DefaultELHelper();
- }
return this.elHelper;
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java?rev=720363&r1=720362&r2=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java Mon Nov 24 16:19:51 2008
@@ -34,18 +34,12 @@
@UsageInformation(UsageCategory.API)
public interface ELHelper
{
- Class getTypeOfValueBindingForExpression(FacesContext facesContext, ValueBindingExpression valueBindingExpression);
-
- Class getTypeOfValueBindingForComponent(FacesContext facesContext, UIComponent uiComponent);
-
Object getBean(String beanName);
- Object getBaseObject(ValueBindingExpression valueBindingExpression);
-
- Object getBaseObject(ValueBindingExpression valueBindingExpression, UIComponent uiComponent);
-
Object getValueOfExpression(FacesContext facesContext, ValueBindingExpression valueBindingExpression);
+ Class getTypeOfExpression(FacesContext facesContext, ValueBindingExpression valueBindingExpression);
+
PropertyDetails getPropertyDetailsOfValueBinding(UIComponent uiComponent);
boolean isExpressionValid(FacesContext facesContext, String valueBindingExpression);
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java?rev=720363&r1=720362&r2=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java Mon Nov 24 16:19:51 2008
@@ -62,7 +62,7 @@
.substring(0, 1) + "{" + createBinding(foundBindings, mappedFaceletsVars) + "}");
Class entityClass = ExtValUtils.getELHelper()
- .getTypeOfValueBindingForExpression(FacesContext.getCurrentInstance(), vbe.getBaseExpression());
+ .getTypeOfExpression(FacesContext.getCurrentInstance(), vbe.getBaseExpression());
if(entityClass == null)
{
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfig.java (from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigLoader.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfig.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfig.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigLoader.java&r1=712505&r2=720363&rev=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigLoader.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfig.java Mon Nov 24 16:19:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.loader;
+package org.apache.myfaces.extensions.validator.core.initializer.config;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -28,8 +28,8 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.API)
-public interface StaticMappingConfigLoader<T, R>
+public interface StaticConfig<T, R>
{
void setSourceOfMapping(String path);
- List<StaticMappingConfigEntry<T, R>> getMapping();
+ List<StaticConfigEntry<T, R>> getMapping();
}
\ No newline at end of file
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigEntry.java (from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigEntry.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigEntry.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigEntry.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigEntry.java&r1=712505&r2=720363&rev=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigEntry.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigEntry.java Mon Nov 24 16:19:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.loader;
+package org.apache.myfaces.extensions.validator.core.initializer.config;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -26,7 +26,7 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.API)
-public class StaticMappingConfigEntry<T, R>
+public class StaticConfigEntry<T, R>
{
private T source;
private R target;
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigNames.java (from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigLoaderNames.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigNames.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigNames.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigLoaderNames.java&r1=712505&r2=720363&rev=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticMappingConfigLoaderNames.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticConfigNames.java Mon Nov 24 16:19:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.loader;
+package org.apache.myfaces.extensions.validator.core.initializer.config;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -26,9 +26,9 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.API})
-public enum StaticMappingConfigLoaderNames
+public enum StaticConfigNames
{
- META_DATA_TO_VALIDATION_STRATEGY_CONFIG_LOADER,
- VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_CONFIG_LOADER,
- VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_CONFIG_LOADER
+ 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/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticInMemoryConfig.java (from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticInMemoryMappingConfig.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticInMemoryConfig.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticInMemoryConfig.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticInMemoryMappingConfig.java&r1=712505&r2=720363&rev=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticInMemoryMappingConfig.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticInMemoryConfig.java Mon Nov 24 16:19:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.loader;
+package org.apache.myfaces.extensions.validator.core.initializer.config;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -29,23 +29,23 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.REUSE})
-public class StaticInMemoryMappingConfig implements StaticMappingConfigLoader<String, String>
+public class StaticInMemoryConfig implements StaticConfig<String, String>
{
- private List<StaticMappingConfigEntry<String, String>> mappings
- = new ArrayList<StaticMappingConfigEntry<String, String>>();
+ private List<StaticConfigEntry<String, String>> mappings
+ = new ArrayList<StaticConfigEntry<String, String>>();
public void setSourceOfMapping(String path)
{
}
- public List<StaticMappingConfigEntry<String, String>> getMapping()
+ public List<StaticConfigEntry<String, String>> getMapping()
{
return mappings;
}
public void addMapping(String source, String target)
{
- StaticMappingConfigEntry<String, String> entry = new StaticMappingConfigEntry<String, String>();
+ StaticConfigEntry<String, String> entry = new StaticConfigEntry<String, String>();
entry.setSource(source);
entry.setTarget(target);
this.mappings.add(entry);
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticResourceBundleConfig.java (from r712505, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticResourceBundleLoader.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticResourceBundleConfig.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticResourceBundleConfig.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticResourceBundleLoader.java&r1=712505&r2=720363&rev=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/loader/StaticResourceBundleLoader.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/config/StaticResourceBundleConfig.java Mon Nov 24 16:19:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.loader;
+package org.apache.myfaces.extensions.validator.core.initializer.config;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -31,10 +31,10 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.REUSE})
-public class StaticResourceBundleLoader implements StaticMappingConfigLoader<String, String>
+public class StaticResourceBundleConfig implements StaticConfig<String, String>
{
private String path;
- private List<StaticMappingConfigEntry<String, String>> mappings;
+ private List<StaticConfigEntry<String, String>> mappings;
public void setSourceOfMapping(String path)
{
@@ -43,21 +43,21 @@
mappings = null;
}
- public List<StaticMappingConfigEntry<String, String>> getMapping()
+ public List<StaticConfigEntry<String, String>> getMapping()
{
if(mappings != null)
{
return mappings;
}
- mappings = new ArrayList<StaticMappingConfigEntry<String, String>>();
+ mappings = new ArrayList<StaticConfigEntry<String, String>>();
ResourceBundle mapping = ResourceBundle.getBundle(path);
if (mapping == null)
{
//logging
- return new ArrayList<StaticMappingConfigEntry<String, String>>();
+ return new ArrayList<StaticConfigEntry<String, String>>();
}
Enumeration keys = mapping.getKeys();
@@ -77,7 +77,7 @@
private void addMapping(String metaDataKey, String validationStrategyClassName)
{
- StaticMappingConfigEntry<String, String> entry = new StaticMappingConfigEntry<String, String>();
+ StaticConfigEntry<String, String> entry = new StaticConfigEntry<String, String>();
entry.setSource(metaDataKey);
entry.setTarget(validationStrategyClassName);
this.mappings.add(entry);
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.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?rev=720363&r1=720362&r2=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java Mon Nov 24 16:19:51 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.loader.StaticMappingConfigLoader;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigLoaderNames;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigEntry;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfig;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfigNames;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfigEntry;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -151,18 +151,18 @@
validationStrategyToMetaDataTransformerMapping = new HashMap<String, String>();
//setup internal static mappings
- for (StaticMappingConfigLoader<String, String> staticMappingConfigLoader :
- ExtValContext.getContext().getStaticMappingConfigLoaders(
- StaticMappingConfigLoaderNames.VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_CONFIG_LOADER))
+ for (StaticConfig<String, String> staticConfig :
+ ExtValContext.getContext().getStaticConfig(
+ StaticConfigNames.VALIDATION_STRATEGY_TO_META_DATA_TRANSFORMER_CONFIG))
{
- setupStrategyMappings(staticMappingConfigLoader.getMapping());
+ setupStrategyMappings(staticConfig.getMapping());
}
}
}
- private void setupStrategyMappings(List<StaticMappingConfigEntry<String, String>> mappings)
+ private void setupStrategyMappings(List<StaticConfigEntry<String, String>> mappings)
{
- for(StaticMappingConfigEntry<String, String> mapping : mappings)
+ for(StaticConfigEntry<String, String> mapping : mappings)
{
addMapping(mapping.getSource(), mapping.getTarget());
}
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=720363&r1=720362&r2=720363&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 Mon Nov 24 16:19:51 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.loader.StaticMappingConfigLoader;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigEntry;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigLoaderNames;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfig;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfigEntry;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfigNames;
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 (StaticMappingConfigLoader<String, String> staticMappingConfigLoader :
- ExtValContext.getContext().getStaticMappingConfigLoaders(
- StaticMappingConfigLoaderNames.VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_CONFIG_LOADER))
+ for (StaticConfig<String, String> staticConfig :
+ ExtValContext.getContext().getStaticConfig(
+ StaticConfigNames.VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_CONFIG))
{
- setupStrategyMappings(staticMappingConfigLoader.getMapping());
+ setupStrategyMappings(staticConfig.getMapping());
}
}
}
- private void setupStrategyMappings(List<StaticMappingConfigEntry<String,String>> mappings)
+ private void setupStrategyMappings(List<StaticConfigEntry<String,String>> mappings)
{
- for(StaticMappingConfigEntry<String, String> mapping : mappings)
+ for(StaticConfigEntry<String, String> mapping : mappings)
{
addMapping(mapping.getSource(), mapping.getTarget());
}
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=720363&r1=720362&r2=720363&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 Mon Nov 24 16:19:51 2008
@@ -22,11 +22,11 @@
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInfo;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigLoader;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigEntry;
-import org.apache.myfaces.extensions.validator.core.loader.StaticResourceBundleLoader;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigLoaderNames;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfig;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfigEntry;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfigNames;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticResourceBundleConfig;
import org.apache.myfaces.extensions.validator.core.validation.strategy.mapper
.AnnotationToValidationStrategyBeanNameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.mapper
@@ -172,22 +172,22 @@
metaDataKeyToValidationStrategyMapping = new HashMap<String, String>();
//setup internal static mappings
- for (StaticMappingConfigLoader<String, String> staticMappingConfigLoader :
- ExtValContext.getContext().getStaticMappingConfigLoaders(
- StaticMappingConfigLoaderNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG_LOADER))
+ for (StaticConfig<String, String> staticConfig :
+ ExtValContext.getContext().getStaticConfig(
+ StaticConfigNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG))
{
- setupStrategyMappings(staticMappingConfigLoader.getMapping());
+ setupStrategyMappings(staticConfig.getMapping());
}
- StaticMappingConfigLoader<String, String> staticMappingConfigLoader = new StaticResourceBundleLoader();
+ StaticConfig<String, String> staticConfig = new StaticResourceBundleConfig();
//try to setup mapping with base name by convention - overrides default mapping
try
{
//build convention (strategy mapping)
- staticMappingConfigLoader.setSourceOfMapping(ExtValContext.getContext().getInformationProviderBean()
+ staticConfig.setSourceOfMapping(ExtValContext.getContext().getInformationProviderBean()
.get(CustomInfo.STATIC_STRATEGY_MAPPING_SOURCE));
- setupStrategyMappings(staticMappingConfigLoader.getMapping());
+ setupStrategyMappings(staticConfig.getMapping());
}
catch (Throwable t)
{
@@ -200,9 +200,9 @@
{
try
{
- staticMappingConfigLoader = new StaticResourceBundleLoader();
- staticMappingConfigLoader.setSourceOfMapping(customMappingBaseName);
- setupStrategyMappings(staticMappingConfigLoader.getMapping());
+ staticConfig = new StaticResourceBundleConfig();
+ staticConfig.setSourceOfMapping(customMappingBaseName);
+ setupStrategyMappings(staticConfig.getMapping());
}
catch (MissingResourceException e)
{
@@ -212,9 +212,9 @@
}
}
- private void setupStrategyMappings(List<StaticMappingConfigEntry<String,String>> mappings)
+ private void setupStrategyMappings(List<StaticConfigEntry<String,String>> mappings)
{
- for(StaticMappingConfigEntry<String, String> mapping : mappings)
+ for(StaticConfigEntry<String, String> mapping : mappings)
{
addMapping(mapping.getSource(), mapping.getTarget());
}
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=720363&r1=720362&r2=720363&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 Mon Nov 24 16:19:51 2008
@@ -126,7 +126,8 @@
ValueBindingExpression vbe = new ValueBindingExpression(targetExpression);
String expression = vbe.getExpressionString();
- baseObject = ExtValUtils.getELHelper().getBaseObject(vbe);
+ baseObject = ExtValUtils.getELHelper()
+ .getValueOfExpression(FacesContext.getCurrentInstance(), vbe.getBaseExpression());
return new PropertyDetails(
expression.substring(2, expression.length() - 1), baseObject, vbe.getProperty());
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java?rev=720363&r1=720362&r2=720363&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java Mon Nov 24 16:19:51 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.loader.StaticResourceBundleLoader;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigLoader;
-import org.apache.myfaces.extensions.validator.core.loader.StaticMappingConfigLoaderNames;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticResourceBundleConfig;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfig;
+import org.apache.myfaces.extensions.validator.core.initializer.config.StaticConfigNames;
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"))
{
- StaticMappingConfigLoader<String, String> staticMappingConfigLoader = new StaticResourceBundleLoader();
- staticMappingConfigLoader.setSourceOfMapping(
+ StaticConfig<String, String> staticConfig = new StaticResourceBundleConfig();
+ staticConfig.setSourceOfMapping(
ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME +".jpa_strategy_mappings");
- ExtValContext.getContext().addStaticMappingConfigLoader(
- StaticMappingConfigLoaderNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG_LOADER, staticMappingConfigLoader);
+ ExtValContext.getContext().addStaticConfig(
+ StaticConfigNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG, staticConfig);
}
}