You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by rd...@apache.org on 2010/07/22 16:15:34 UTC
svn commit: r966673 - in
/myfaces/extensions/validator/branches/branch_for_jsf_1_1:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/
core/src/main/java/org/apache/myfaces/extensions/validator/co...
Author: rdebusscher
Date: Thu Jul 22 14:15:33 2010
New Revision: 966673
URL: http://svn.apache.org/viewvc?rev=966673&view=rev
Log:
EXTVAL-100 improvement for module/add-on writers
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationActivateRequiredInitializationTestCase.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationDeactivateRequiredAttributeSupportTestCase.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java?rev=966673&r1=966672&r2=966673&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java Thu Jul 22 14:15:33 2010
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.validator.trinidad.startup;
import org.apache.myfaces.extensions.validator.core.startup.AbstractStartupListener;
+import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.storage.StorageManagerHolder;
@@ -142,10 +143,10 @@ public class TrinidadModuleStartupListen
protected void initRequiredInitialization()
{
- ExtValContext.getContext().addGlobalProperty("mode:init:required", Boolean.TRUE, true);
+ DefaultExtValCoreConfiguration.overruleActivateRequiredInitialization(Boolean.TRUE, true);
//there is no support for client-side severity aware validation -> don't reset the value
- ExtValContext.getContext().addGlobalProperty("mode:reset:required", Boolean.FALSE, false);
+ DefaultExtValCoreConfiguration.overruleDeactivateRequiredAttributeSupport(Boolean.FALSE, false);
}
private boolean isRequiredInitializationDeactivated()
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java?rev=966673&r1=966672&r2=966673&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java Thu Jul 22 14:15:33 2010
@@ -41,6 +41,9 @@ import java.lang.annotation.Annotation;
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultExtValCoreConfiguration extends ExtValCoreConfiguration
{
+ private static final String GLOBAL_PROPERTY_MODE_INIT_REQUIRED = "mode:init:required";
+ private static final String GLOBAL_PROPERTY_MODE_RESET_REQUIRED = "mode:reset:required";
+
public String customMessageBundleBaseName()
{
return WebXmlParameter.CUSTOM_MESSAGE_BUNDLE;
@@ -219,7 +222,8 @@ public class DefaultExtValCoreConfigurat
public boolean activateRequiredInitialization()
{
- Boolean globalProperty = (Boolean)ExtValContext.getContext().getGlobalProperty("mode:init:required");
+ Boolean globalProperty = (Boolean)ExtValContext.getContext().getGlobalProperty(
+ GLOBAL_PROPERTY_MODE_INIT_REQUIRED);
if(globalProperty != null)
{
@@ -230,6 +234,19 @@ public class DefaultExtValCoreConfigurat
"true".equalsIgnoreCase(WebXmlParameter.ACTIVATE_REQUIRED_INITIALIZATION);
}
+ /**
+ * Module and add-on writers can use this method to overrule the value of the parameter
+ * activateRequiredInitialization. it is also useful for them to specify a certain parameter value without the need
+ * for a web.xml initialization parameter.
+ *
+ * @param value The value we want to give the parameter
+ * @param forceOverride do we force overriding of another value set by a call to this overrule method.
+ */
+ public static void overruleActivateRequiredInitialization(Boolean value, boolean forceOverride)
+ {
+ ExtValContext.getContext().addGlobalProperty(GLOBAL_PROPERTY_MODE_INIT_REQUIRED, value, forceOverride);
+ }
+
public boolean deactivateDefaultConvention()
{
return "true".equalsIgnoreCase(WebXmlParameter.DEACTIVATE_DEFAULT_CONVENTION);
@@ -263,7 +280,8 @@ public class DefaultExtValCoreConfigurat
public boolean deactivateRequiredAttributeSupport()
{
- Boolean globalProperty = (Boolean)ExtValContext.getContext().getGlobalProperty("mode:reset:required");
+ Boolean globalProperty = (Boolean)ExtValContext.getContext().getGlobalProperty(
+ GLOBAL_PROPERTY_MODE_RESET_REQUIRED);
if(globalProperty != null)
{
@@ -273,7 +291,20 @@ public class DefaultExtValCoreConfigurat
return WebXmlParameter.DEACTIVATE_REQUIRED_ATTRIBUTE_SUPPORT != null &&
"true".equalsIgnoreCase(WebXmlParameter.DEACTIVATE_REQUIRED_ATTRIBUTE_SUPPORT);
}
-
+
+ /**
+ * Module and add-on writers can use this method to overrule the value of the parameter
+ * deactivateRequiredAttributeSupport. It is also useful for them to specify a certain parameter value without the
+ * need for a web.xml initialization parameter.
+ *
+ * @param value The value we want to give the parameter
+ * @param forceOverride do we force overriding of another value set by a call to this overrule method.
+ */
+ public static void overruleDeactivateRequiredAttributeSupport(Boolean value, boolean forceOverride)
+ {
+ ExtValContext.getContext().addGlobalProperty(GLOBAL_PROPERTY_MODE_RESET_REQUIRED, value, forceOverride);
+ }
+
public boolean interpretEmptyStringSubmittedValuesAsNull()
{
return !"false".equalsIgnoreCase(WebXmlParameter.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL);
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationActivateRequiredInitializationTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationActivateRequiredInitializationTestCase.java?rev=966673&r1=966672&r2=966673&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationActivateRequiredInitializationTestCase.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationActivateRequiredInitializationTestCase.java Thu Jul 22 14:15:33 2010
@@ -78,11 +78,23 @@ public class ExtValCoreConfigurationActi
assertFalse(ExtValUtils.isRequiredInitializationActive());
}
+ public void testActivateRequiredInitializationDefaultWithOverrule()
+ {
+ DefaultExtValCoreConfiguration.overruleActivateRequiredInitialization(Boolean.TRUE, true);
+ assertTrue(ExtValUtils.isRequiredInitializationActive());
+ }
+
public void testActivateRequiredInitializationWebXml()
{
assertTrue(ExtValUtils.isRequiredInitializationActive());
}
+ public void testActivateRequiredInitializationWebXmlWithOverrule()
+ {
+ DefaultExtValCoreConfiguration.overruleActivateRequiredInitialization(Boolean.FALSE, true);
+ assertFalse(ExtValUtils.isRequiredInitializationActive());
+ }
+
public void testActivateRequiredInitializationCustomConfig()
{
assertTrue(ExtValUtils.isRequiredInitializationActive());
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationDeactivateRequiredAttributeSupportTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationDeactivateRequiredAttributeSupportTestCase.java?rev=966673&r1=966672&r2=966673&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationDeactivateRequiredAttributeSupportTestCase.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationDeactivateRequiredAttributeSupportTestCase.java Thu Jul 22 14:15:33 2010
@@ -74,11 +74,23 @@ public class ExtValCoreConfigurationDeac
assertFalse(ExtValUtils.isRequiredResetActivated());
}
+ public void testDeactivateRequiredAttributeSupportDefaultWithOverrule()
+ {
+ DefaultExtValCoreConfiguration.overruleDeactivateRequiredAttributeSupport(Boolean.TRUE, true);
+ assertTrue(ExtValUtils.isRequiredResetActivated());
+ }
+
public void testDeactivateRequiredAttributeSupportWebXml()
{
assertTrue(ExtValUtils.isRequiredResetActivated());
}
+ public void testDeactivateRequiredAttributeSupportWebXmlWithOverrule()
+ {
+ DefaultExtValCoreConfiguration.overruleDeactivateRequiredAttributeSupport(Boolean.FALSE, true);
+ assertFalse(ExtValUtils.isRequiredResetActivated());
+ }
+
public void testDeactivateRequiredAttributeSupportCustomConfig()
{
assertTrue(ExtValUtils.isRequiredResetActivated());