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 2010/07/14 14:35:35 UTC
svn commit: r964032 [2/2] - in
/myfaces/extensions/validator/branches/branch_for_jsf_2_0:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/
component-support/trinidad-support/src/main/java/org/apache/myf...
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java Wed Jul 14 12:35:34 2010
@@ -26,7 +26,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.interceptor.FacesMessagePropertyValidationInterceptor;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
+import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.PhaseIdRecordingPhaseListener;
import org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper
.BeanValidationStrategyToMetaDataTransformerNameMapper;
@@ -61,10 +62,6 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.validation.parameter.DefaultViolationSeverityInterpreter;
import org.apache.myfaces.extensions.validator.core.validation.parameter.ViolationSeverity;
import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
-import org.apache.myfaces.extensions.validator.core.validation.ConstraintSource;
-import org.apache.myfaces.extensions.validator.core.validation.IgnoreConstraintSource;
-import org.apache.myfaces.extensions.validator.core.validation.TargetProperty;
-import org.apache.myfaces.extensions.validator.core.validation.TargetPropertyId;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.util.JsfUtils;
@@ -79,6 +76,11 @@ public class ExtValStartupListener exten
{
private static final long serialVersionUID = -2504826421086572012L;
+ protected void initModuleConfig()
+ {
+ ExtValCoreConfiguration.use(new DefaultExtValCoreConfiguration(), false);
+ }
+
protected void init()
{
if(ExtValInformation.VERSION != null)
@@ -100,15 +102,13 @@ public class ExtValStartupListener exten
initViolationSeverityKey();
initDisableClientSideValidationKey();
initRequiredInitialization();
- initDefaultConstraintSourceAnnotations();
executeCustomStartupListener();
}
private void initNameMappers()
{
- String deactivateDefaultNameMappers = WebXmlParameter.DEACTIVATE_DEFAULT_NAME_MAPPERS;
- if ((deactivateDefaultNameMappers != null && deactivateDefaultNameMappers.equalsIgnoreCase("true")))
+ if (ExtValCoreConfiguration.get().deactivateDefaultNameMappers())
{
return;
}
@@ -201,50 +201,45 @@ public class ExtValStartupListener exten
JsfUtils.registerPhaseListener(new PhaseIdRecordingPhaseListener());
}
+ @Deprecated
private void initViolationSeverityKey()
{
- ExtValContext.getContext().addGlobalProperty(ViolationSeverity.class.getName(), ViolationSeverity.class, false);
+ ExtValContext.getContext().addGlobalProperty(ViolationSeverity.class.getName(),
+ ExtValCoreConfiguration.get().violationSeverity(), false);
}
+ @Deprecated
private void initDisableClientSideValidationKey()
{
- ExtValContext.getContext().addGlobalProperty(
- DisableClientSideValidation.class.getName(), DisableClientSideValidation.class, false);
+ ExtValContext.getContext().addGlobalProperty(DisableClientSideValidation.class.getName(),
+ ExtValCoreConfiguration.get().disableClientSideValidationValidationParameter(), false);
}
private void initRequiredInitialization()
{
- if(WebXmlParameter.ACTIVATE_REQUIRED_INITIALIZATION != null)
- {
- boolean requiredInitialization = "true".equalsIgnoreCase(WebXmlParameter.ACTIVATE_REQUIRED_INITIALIZATION);
+ boolean requiredInitialization = ExtValCoreConfiguration.get().activateRequiredInitialization();
- ExtValContext.getContext().addGlobalProperty("mode:init:required", requiredInitialization, false);
+ //noinspection deprecation
+ addRequiredInitializationAsGlobalProperty(requiredInitialization);
- if(requiredInitialization)
- {
- deactivateRequiredAttributeSupport();
- }
- }
+ initRequiredAttributeSupport();
}
- private void initDefaultConstraintSourceAnnotations()
+ @Deprecated
+ private void addRequiredInitializationAsGlobalProperty(boolean requiredInitialization)
{
- ExtValContext.getContext()
- .addGlobalProperty(ConstraintSource.class.getName(), ConstraintSource.class, false);
- ExtValContext.getContext()
- .addGlobalProperty(IgnoreConstraintSource.class.getName(), IgnoreConstraintSource.class, false);
- ExtValContext.getContext()
- .addGlobalProperty(TargetProperty.class.getName(), TargetProperty.class, false);
- ExtValContext.getContext()
- .addGlobalProperty(TargetPropertyId.class.getName(), TargetPropertyId.class, false);
+ ExtValContext.getContext().addGlobalProperty("mode:init:required", requiredInitialization, false);
}
/**
* if it's configured that required init should happen,
* it's required to deactivate the support for the required attribute
*/
- private void deactivateRequiredAttributeSupport()
+ @Deprecated
+ private void initRequiredAttributeSupport()
{
- ExtValContext.getContext().addGlobalProperty("mode:reset:required", Boolean.TRUE, false);
+ ExtValContext.getContext().addGlobalProperty("mode:reset:required",
+ ExtValCoreConfiguration.get().deactivateRequiredAttributeSupport(),
+ false);
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/AbstractStorageManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/AbstractStorageManager.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/AbstractStorageManager.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/AbstractStorageManager.java Wed Jul 14 12:35:34 2010
@@ -79,14 +79,17 @@ public abstract class AbstractStorageMan
if(!storageMap.containsKey(storageKey))
{
- storageMap.put(storageKey, (T)ClassUtils.tryToInstantiateClassForName(storageClassName));
+ synchronized (storageMap)
+ {
+ storageMap.put(storageKey, (T)ClassUtils.tryToInstantiateClassForName(storageClassName));
+ }
}
return storageMap.get(storageKey);
}
protected abstract Map<String, T> resolveStorageMap();
- public void reset(String storageKey)
+ public synchronized void reset(String storageKey)
{
Map<String, T> storageMap = resolveStorageMap();
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMetaDataStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMetaDataStorage.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMetaDataStorage.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMetaDataStorage.java Wed Jul 14 12:35:34 2010
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.core.storage;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
@@ -27,7 +28,6 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
import org.apache.myfaces.extensions.validator.core.property.DefaultPropertyInformation;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
@@ -67,7 +67,7 @@ public class DefaultMetaDataStorage impl
List<String> metaDataStorageFilterClassNames = new ArrayList<String>();
metaDataStorageFilterClassNames
- .add(WebXmlParameter.CUSTOM_META_DATA_STORAGE_FILTER);
+ .add(ExtValCoreConfiguration.get().customMetaDataStorageFilterClassName());
metaDataStorageFilterClassNames
.add(ExtValContext.getContext().getInformationProviderBean().get(
CustomInformation.META_DATA_STORAGE_FILTER));
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java Wed Jul 14 12:35:34 2010
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.extensions.validator.core.validation.message.resolver;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
@@ -46,7 +46,7 @@ public abstract class AbstractValidation
protected final Logger logger = Logger.getLogger(getClass().getName());
- private static String deactivateDefaultConvention = WebXmlParameter.DEACTIVATE_DEFAULT_CONVENTION;
+ private static boolean deactivateDefaultConvention = ExtValCoreConfiguration.get().deactivateDefaultConvention();
private static ResourceBundle defaultBundle = null;
private String messageBundleBaseName;
//with jsf 1.1 only available if there is a custom bean
@@ -162,8 +162,7 @@ public abstract class AbstractValidation
private String tryToUseMessageBundleConvention(String key, Locale locale)
{
- if ((deactivateDefaultConvention == null || !deactivateDefaultConvention.equalsIgnoreCase("true"))
- && isDefaultMessageBundleConventionActive())
+ if ((deactivateDefaultConvention) && isDefaultMessageBundleConventionActive())
{
if (defaultBundle == null)
{
@@ -175,7 +174,7 @@ public abstract class AbstractValidation
catch (Exception e)
{
//do nothing
- deactivateDefaultConvention = "true";
+ deactivateDefaultConvention = true;
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java Wed Jul 14 12:35:34 2010
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.core.validation.message.resolver;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.InternalConventionProvider;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -33,16 +33,23 @@ import org.apache.myfaces.extensions.val
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.CUSTOMIZABLE})
public class DefaultValidationErrorMessageResolver extends AbstractValidationErrorMessageResolver
{
- private static final String CUSTOM_BUNDLE = WebXmlParameter.CUSTOM_MESSAGE_BUNDLE;
+ private static final String CUSTOM_BUNDLE = ExtValCoreConfiguration.get().customMessageBundleBaseName();
+
+ private final String baseName;
+
+ public DefaultValidationErrorMessageResolver()
+ {
+ this.baseName = InternalConventionProvider.getModuleMessageBundleName(getClass().getPackage().getName());
+ }
//not used at the moment - just for a convention
protected String getBaseName()
{
- return InternalConventionProvider.getModuleMessageBundleName(getClass().getPackage().getName());
+ return this.baseName;
}
protected String getCustomBaseName()
{
return CUSTOM_BUNDLE;
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/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/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConfiguredValidationStrategyToMsgResolverNameMapper.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConfiguredValidationStrategyToMsgResolverNameMapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConfiguredValidationStrategyToMsgResolverNameMapper.java Wed Jul 14 12:35:34 2010
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.core.validation.message.resolver.mapper;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.InvocationOrder;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.mapper.AbstractCustomNameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -40,6 +40,6 @@ public class CustomConfiguredValidationS
protected String getCustomNameMapperClassName()
{
- return WebXmlParameter.CUSTOM_VALIDATION_STRATEGY_TO_MESSAGE_RESOLVER_NAME_MAPPER;
+ return ExtValCoreConfiguration.get().customValidationStrategyToMessageResolverNameMapperClassName();
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractorFactory.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractorFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractorFactory.java Wed Jul 14 12:35:34 2010
@@ -20,9 +20,9 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
import java.util.ArrayList;
@@ -51,7 +51,8 @@ public class DefaultValidationParameterE
{
List<String> validationParameterExtractorClassNames = new ArrayList<String>();
- validationParameterExtractorClassNames.add(WebXmlParameter.CUSTOM_VALIDATION_PARAMETER_EXTRACTOR);
+ validationParameterExtractorClassNames
+ .add(ExtValCoreConfiguration.get().customValidationParameterExtractorClassName());
validationParameterExtractorClassNames
.add(ExtValContext.getContext().getInformationProviderBean()
.get(CustomInformation.VALIDATION_PARAMETER_EXTRACTOR));
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java Wed Jul 14 12:35:34 2010
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.extensions.validator.core.validation.strategy;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.factory.ClassMappingFactory;
import org.apache.myfaces.extensions.validator.core.factory.AbstractNameMapperAwareFactory;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
@@ -158,7 +158,7 @@ public class DefaultValidationStrategyFa
}
//setup custom mapping - overrides all other mappings
- String customMappingBaseName = WebXmlParameter.CUSTOM_STATIC_VALIDATION_STRATEGY_MAPPING;
+ String customMappingBaseName = ExtValCoreConfiguration.get().customStaticValidationStrategyMappingSource();
if (customMappingBaseName != null)
{
try
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConfiguredAnnotationToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConfiguredAnnotationToValidationStrategyNameMapper.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConfiguredAnnotationToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConfiguredAnnotationToValidationStrategyNameMapper.java Wed Jul 14 12:35:34 2010
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.core.validation.strategy.mapper;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.InvocationOrder;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.mapper.AbstractCustomNameMapper;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -36,8 +36,15 @@ import org.apache.myfaces.extensions.val
public class CustomConfiguredAnnotationToValidationStrategyNameMapper extends
AbstractCustomNameMapper<String>
{
+ private final String customNameMapperClassName;
+ public CustomConfiguredAnnotationToValidationStrategyNameMapper()
+ {
+ this.customNameMapperClassName =
+ ExtValCoreConfiguration.get().customMetaDataToValidationStrategyNameMapperClassName();
+ }
+
protected String getCustomNameMapperClassName()
{
- return WebXmlParameter.CUSTOM_META_DATA_TO_VALIDATION_STRATEGY_NAME_MAPPER;
+ return this.customNameMapperClassName;
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ClassUtils.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ClassUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ClassUtils.java Wed Jul 14 12:35:34 2010
@@ -117,4 +117,23 @@ public class ClassUtils
return null;
}
}
+
+ /**
+ * Gets the package name.
+ * Needed for ClassLoaderTestSuite
+ *
+ * @param targetClass the the class
+ * @return the package name
+ */
+ public static String getPackageName(Class targetClass)
+ {
+ Package currentPackage = targetClass.getPackage();
+
+ if(currentPackage != null)
+ {
+ return currentPackage.getName();
+ }
+
+ return targetClass.getName().substring(0, targetClass.getName().lastIndexOf("."));
+ }
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ConstraintSourceUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ConstraintSourceUtils.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ConstraintSourceUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ConstraintSourceUtils.java Wed Jul 14 12:35:34 2010
@@ -23,14 +23,10 @@ import java.lang.reflect.Field;
import java.beans.Introspector;
import java.lang.reflect.Method;
-import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.myfaces.extensions.validator.core.storage.MappedConstraintSourceStorage;
import org.apache.myfaces.extensions.validator.core.storage.PropertyStorage;
-import org.apache.myfaces.extensions.validator.core.validation.ConstraintSource;
-import org.apache.myfaces.extensions.validator.core.validation.IgnoreConstraintSource;
-import org.apache.myfaces.extensions.validator.core.validation.TargetProperty;
-import org.apache.myfaces.extensions.validator.core.validation.TargetPropertyId;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -42,7 +38,7 @@ import org.apache.myfaces.extensions.val
@SuppressWarnings("unchecked")
public final class ConstraintSourceUtils
{
- private ConstraintSourceUtils()
+ protected ConstraintSourceUtils()
{
// Utility class, don't allow instantiation.
}
@@ -108,8 +104,8 @@ public final class ConstraintSourceUtils
private static Class findMappedClass(PropertyStorage storage, Class baseBeanClass, String property)
{
- Class<? extends Annotation> constraintSourceAnnotationImplementation = (Class) ExtValContext.getContext()
- .getGlobalProperty(ConstraintSource.class.getName());
+ Class<? extends Annotation> constraintSourceAnnotationImplementation = ExtValCoreConfiguration.get()
+ .constraintSourceAnnotation();
Annotation foundConstraintSourceAnnotation = tryToGetAnnotationFromProperty(
storage, baseBeanClass, property, constraintSourceAnnotationImplementation);
@@ -166,12 +162,12 @@ public final class ConstraintSourceUtils
private static Class<? extends Annotation> getTargetPropertyAnnotationImplementation()
{
- return (Class) ExtValContext.getContext().getGlobalProperty(TargetProperty.class.getName());
+ return ExtValCoreConfiguration.get().targetPropertyAnnotation();
}
private static Class<? extends Annotation> getTargetPropertyIdAnnotationImplementation()
{
- return (Class) ExtValContext.getContext().getGlobalProperty(TargetPropertyId.class.getName());
+ return ExtValCoreConfiguration.get().targetPropertyIdAnnotation();
}
private static String extractNewPropertyName(Class targetClass, Annotation annotation)
@@ -302,7 +298,7 @@ public final class ConstraintSourceUtils
private static Class<? extends Annotation> getIgnoreConstraintSourceAnnotationImplementation()
{
- return (Class) ExtValContext.getContext().getGlobalProperty(IgnoreConstraintSource.class.getName());
+ return ExtValCoreConfiguration.get().ignoreConstraintSourceAnnotation();
}
private static Annotation tryToGetAnnotationFromField(
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java Wed Jul 14 12:35:34 2010
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.util;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ValidationModuleKey;
import org.apache.myfaces.extensions.validator.core.ProjectStageName;
import org.apache.myfaces.extensions.validator.core.el.AbstractELHelperFactory;
@@ -532,7 +532,7 @@ public class ExtValUtils
private static boolean isValidationParameterExtractionDeactivated()
{
- return "true".equalsIgnoreCase(WebXmlParameter.DEACTIVATE_VALIDATION_PARAMETERS);
+ return ExtValCoreConfiguration.get().deactivateValidationParameters();
}
public static boolean executeLocalBeforeValidationInterceptors(FacesContext facesContext,
@@ -848,12 +848,12 @@ public class ExtValUtils
public static boolean interpretEmptyStringValuesAsNull()
{
//to deactivate: the parameter has to be explicitly false
- return !"false".equalsIgnoreCase(WebXmlParameter.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL);
+ return ExtValCoreConfiguration.get().interpretEmptyStringSubmittedValuesAsNull();
}
public static boolean validateEmptyFields()
{
- return !"false".equalsIgnoreCase(WebXmlParameter.VALIDATE_EMPTY_FIELDS);
+ return ExtValCoreConfiguration.get().validateEmptyFields();
}
public static PropertyDetails getPropertyDetails(PropertyInformation propertyInformation)
@@ -1020,7 +1020,7 @@ public class ExtValUtils
*/
public static boolean isRequiredInitializationActive()
{
- return Boolean.TRUE.equals(ExtValContext.getContext().getGlobalProperty("mode:init:required"));
+ return ExtValCoreConfiguration.get().activateRequiredInitialization();
}
/**
@@ -1032,7 +1032,7 @@ public class ExtValUtils
*/
public static boolean isRequiredResetActivated()
{
- return Boolean.TRUE.equals(ExtValContext.getContext().getGlobalProperty("mode:reset:required"));
+ return ExtValCoreConfiguration.get().deactivateRequiredAttributeSupport();
}
public static ProjectStageName getDefaultStageName()
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ProxyUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ProxyUtils.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ProxyUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ProxyUtils.java Wed Jul 14 12:35:34 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.proxy.ProxyHelper;
import org.apache.myfaces.extensions.validator.core.proxy.DefaultProxyHelper;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -73,26 +73,8 @@ public class ProxyUtils
return new DefaultProxyHelper();
}
- proxyHelper = createProxyHelper();
+ proxyHelper = ExtValCoreConfiguration.get().proxyHelper();
}
return proxyHelper;
}
-
- //don't use the default approach (factory finder) - ProxyHelper is called too often...
- private static ProxyHelper createProxyHelper()
- {
- String customProxyHelperClassName = WebXmlParameter.CUSTOM_PROXY_HELPER;
-
- ProxyHelper result = null;
- if(customProxyHelperClassName != null && !"".equals(customProxyHelperClassName))
- {
- result = (ProxyHelper)ClassUtils.tryToInstantiateClassForName(customProxyHelperClassName);
- }
- if(result == null)
- {
- result = new DefaultProxyHelper();
- }
-
- return result;
- }
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java Wed Jul 14 12:35:34 2010
@@ -18,7 +18,8 @@
*/
package org.apache.myfaces.extensions.validator;
-import org.apache.myfaces.extensions.validator.baseval.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.baseval.ExtValBaseValidationModuleConfiguration;
+import org.apache.myfaces.extensions.validator.baseval.DefaultExtValBaseValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.baseval.annotation.SkipValidationSupport;
import org.apache.myfaces.extensions.validator.core.startup.AbstractStartupListener;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
@@ -44,6 +45,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.crossval.storage.mapper.CrossValidationStorageNameMapper;
import org.apache.myfaces.extensions.validator.crossval.storage.mapper.ProcessedInformationStorageNameMapper;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationPhaseListener;
+import org.apache.myfaces.extensions.validator.crossval.ExtValCrossValidationModuleConfiguration;
+import org.apache.myfaces.extensions.validator.crossval.DefaultExtValCrossValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.util.JsfUtils;
@@ -56,6 +59,12 @@ public class PropertyValidationModuleSta
{
private static final long serialVersionUID = -2474361612857222283L;
+ protected void initModuleConfig()
+ {
+ ExtValBaseValidationModuleConfiguration.use(new DefaultExtValBaseValidationModuleConfiguration(), false);
+ ExtValCrossValidationModuleConfiguration.use(new DefaultExtValCrossValidationModuleConfiguration(), false);
+ }
+
protected void init()
{
initProcessedInformationRecorders();
@@ -76,9 +85,7 @@ public class PropertyValidationModuleSta
private void initStaticStrategyMappings()
{
- String jpaBasedValidation = WebXmlParameter.DEACTIVATE_JPA_BASED_VALIDATION;
- if (jpaBasedValidation == null
- || !jpaBasedValidation.equalsIgnoreCase("true"))
+ if (!ExtValBaseValidationModuleConfiguration.get().deactivateJpaBasedValidation())
{
StaticConfiguration<String, String> staticConfig = new StaticResourceBundleConfiguration();
staticConfig.setSourceOfMapping(
Added: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/DefaultExtValBaseValidationModuleConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/DefaultExtValBaseValidationModuleConfiguration.java?rev=964032&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/DefaultExtValBaseValidationModuleConfiguration.java (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/DefaultExtValBaseValidationModuleConfiguration.java Wed Jul 14 12:35:34 2010
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.baseval;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+/**
+ * @author Gerhard Petracek
+ * @since r4
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+public class DefaultExtValBaseValidationModuleConfiguration extends ExtValBaseValidationModuleConfiguration
+{
+ public String jpaValidationErrorMessages()
+ {
+ return WebXmlParameter.VALIDATION_MESSAGES_JPA;
+ }
+
+ public boolean deactivateJpaBasedValidation()
+ {
+ return "true".equalsIgnoreCase(WebXmlParameter.DEACTIVATE_JPA_BASED_VALIDATION);
+ }
+}
Added: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java?rev=964032&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java Wed Jul 14 12:35:34 2010
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.baseval;
+
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.ExtValModuleConfiguration;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+/**
+ * @author Gerhard Petracek
+ * @since r4
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+public abstract class ExtValBaseValidationModuleConfiguration implements ExtValModuleConfiguration
+{
+ private static ExtValContext extValContext = ExtValContext.getContext();
+
+ protected ExtValBaseValidationModuleConfiguration()
+ {
+ }
+
+ public static ExtValBaseValidationModuleConfiguration get()
+ {
+ return extValContext.getModuleConfiguration(ExtValBaseValidationModuleConfiguration.class);
+ }
+
+ @UsageInformation(UsageCategory.INTERNAL)
+ public static boolean use(ExtValBaseValidationModuleConfiguration config, boolean forceOverride)
+ {
+ return extValContext.addModuleConfiguration(
+ ExtValBaseValidationModuleConfiguration.class, config, forceOverride);
+ }
+
+ /*
+ * web.xml config
+ */
+
+ public abstract String jpaValidationErrorMessages();
+
+ public abstract boolean deactivateJpaBasedValidation();
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java Wed Jul 14 12:35:34 2010
@@ -32,10 +32,10 @@ import org.apache.myfaces.extensions.val
*/
@ToDo(value = Priority.MEDIUM, description = "documentation")
@UsageInformation(UsageCategory.INTERNAL)
-public interface WebXmlParameter
+interface WebXmlParameter
{
static final String VALIDATION_MESSAGES_JPA = WebXmlUtils
.getInitParameter("JPA_VALIDATION_ERROR_MESSAGES");
static final String DEACTIVATE_JPA_BASED_VALIDATION = WebXmlUtils
.getInitParameter("DEACTIVATE_JPA_BASED_VALIDATION");
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java Wed Jul 14 12:35:34 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.baseval.message.resolver;
-import org.apache.myfaces.extensions.validator.baseval.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.baseval.ExtValBaseValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.core.validation.message.resolver.AbstractValidationErrorMessageResolver;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -37,7 +37,9 @@ public class JpaValidationErrorMessageRe
{
public static final String JPA_VALIDATION_ERROR_MESSAGES = "JPA_VALIDATION_ERROR_MESSAGES";
- private static final String CUSTOM_BASE_NAME = WebXmlParameter.VALIDATION_MESSAGES_JPA;
+ private static final String CUSTOM_BASE_NAME =
+ ExtValBaseValidationModuleConfiguration.get().jpaValidationErrorMessages();
+
private static final String BASE_NAME = JpaValidationErrorMessageResolver.class
.getPackage().getName().replace(".message.resolver", ".message.bundle")+ ".jpa_messages";
@@ -56,4 +58,4 @@ public class JpaValidationErrorMessageRe
return BASE_NAME;
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java Wed Jul 14 12:35:34 2010
@@ -151,8 +151,7 @@ public class CrossValidationPhaseListene
{
if (!isInitialized)
{
- if (WebXmlParameter.DEACTIVATE_CROSSVALIDATION != null
- && WebXmlParameter.DEACTIVATE_CROSSVALIDATION.equalsIgnoreCase("true"))
+ if (ExtValCrossValidationModuleConfiguration.get().deactivateCrossvalidation())
{
JsfUtils.deregisterPhaseListener(this);
}
Added: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/DefaultExtValCrossValidationModuleConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/DefaultExtValCrossValidationModuleConfiguration.java?rev=964032&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/DefaultExtValCrossValidationModuleConfiguration.java (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/DefaultExtValCrossValidationModuleConfiguration.java Wed Jul 14 12:35:34 2010
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.crossval;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+/**
+ * @author Gerhard Petracek
+ * @since r4
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+public class DefaultExtValCrossValidationModuleConfiguration extends ExtValCrossValidationModuleConfiguration
+{
+ public boolean deactivateCrossvalidation()
+ {
+ return "true".equalsIgnoreCase(WebXmlParameter.DEACTIVATE_CROSSVALIDATION);
+ }
+}
Added: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java?rev=964032&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java Wed Jul 14 12:35:34 2010
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.crossval;
+
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.ExtValModuleConfiguration;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+/**
+ * @author Gerhard Petracek
+ * @since r4
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+public abstract class ExtValCrossValidationModuleConfiguration implements ExtValModuleConfiguration
+{
+ private static ExtValContext extValContext = ExtValContext.getContext();
+
+ protected ExtValCrossValidationModuleConfiguration()
+ {
+ }
+
+ public static ExtValCrossValidationModuleConfiguration get()
+ {
+ return extValContext.getModuleConfiguration(ExtValCrossValidationModuleConfiguration.class);
+ }
+
+ @UsageInformation(UsageCategory.INTERNAL)
+ public static boolean use(ExtValCrossValidationModuleConfiguration config, boolean forceOverride)
+ {
+ return extValContext.addModuleConfiguration(
+ ExtValCrossValidationModuleConfiguration.class, config, forceOverride);
+ }
+
+ /*
+ * web.xml config
+ */
+
+ abstract boolean deactivateCrossvalidation();
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java?rev=964032&r1=964031&r2=964032&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java Wed Jul 14 12:35:34 2010
@@ -29,8 +29,8 @@ import org.apache.myfaces.extensions.val
* @since 1.x.1
*/
@UsageInformation(UsageCategory.INTERNAL)
-public interface WebXmlParameter
+interface WebXmlParameter
{
static final String DEACTIVATE_CROSSVALIDATION = WebXmlUtils
.getInitParameter("DEACTIVATE_CROSSVALIDATION");
-}
\ No newline at end of file
+}