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/27 10:20:56 UTC
svn commit: r979584 - in
/myfaces/extensions/validator/branches/branch_for_jsf_1_1:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/
core/src/main/java/org/apache/myfaces/extensions/validator/core/ vali...
Author: rdebusscher
Date: Tue Jul 27 08:20:56 2010
New Revision: 979584
URL: http://svn.apache.org/viewvc?rev=979584&view=rev
Log:
EXTVAL-110
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadSupportModuleConfiguration.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValCoreConfiguration.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadSupportModuleConfiguration.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/ExtValTrinidadSupportModuleConfiguration.java?rev=979584&r1=979583&r2=979584&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadSupportModuleConfiguration.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadSupportModuleConfiguration.java Tue Jul 27 08:20:56 2010
@@ -30,22 +30,37 @@ import org.apache.myfaces.extensions.val
@UsageInformation(UsageCategory.INTERNAL)
public abstract class ExtValTrinidadSupportModuleConfiguration implements ExtValModuleConfiguration
{
- private static ExtValContext extValContext = ExtValContext.getContext();
+ private static ExtValContext extValContext = null;
protected ExtValTrinidadSupportModuleConfiguration()
{
}
+ /**
+ * Don't access ExtValContext during initialization of the class. OpenWebBeans initializes all classes during
+ * startup of the WebContainer. extValContext constructor tries to access Web.xml parameters through FacesContext
+ * which isn't available yet.
+ * @return The ExtValContext
+ */
+ private static ExtValContext getExtValContext()
+ {
+ if (extValContext == null)
+ {
+ extValContext = ExtValContext.getContext();
+ }
+ return extValContext;
+ }
+
public static ExtValTrinidadSupportModuleConfiguration get()
{
- return extValContext.getModuleConfiguration(ExtValTrinidadSupportModuleConfiguration.class);
+ return getExtValContext().getModuleConfiguration(ExtValTrinidadSupportModuleConfiguration.class);
}
@UsageInformation(UsageCategory.INTERNAL)
public static boolean use(ExtValTrinidadSupportModuleConfiguration config, boolean forceOverride)
{
- return extValContext.addModuleConfiguration(
- ExtValTrinidadSupportModuleConfiguration.class, config, forceOverride);
+ return getExtValContext().addModuleConfiguration(ExtValTrinidadSupportModuleConfiguration.class, config,
+ forceOverride);
}
/*
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValCoreConfiguration.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/ExtValCoreConfiguration.java?rev=979584&r1=979583&r2=979584&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValCoreConfiguration.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValCoreConfiguration.java Tue Jul 27 08:20:56 2010
@@ -38,7 +38,7 @@ import java.util.logging.Logger;
@UsageInformation(UsageCategory.INTERNAL)
public abstract class ExtValCoreConfiguration implements ExtValModuleConfiguration
{
- private static ExtValContext extValContext = ExtValContext.getContext();
+ private static ExtValContext extValContext = null;
private static final Logger LOGGER = Logger.getLogger(ExtValCoreConfiguration.class.getName());
@@ -51,9 +51,24 @@ public abstract class ExtValCoreConfigur
{
}
+ /**
+ * Don't access ExtValContext during initialization of the class. OpenWebBeans initializes all classes during
+ * startup of the WebContainer. extValContext constructor tries to access Web.xml parameters through FacesContext
+ * which isn't available yet.
+ * @return The ExtValContext
+ */
+ private static ExtValContext getExtValContext()
+ {
+ if (extValContext == null)
+ {
+ extValContext = ExtValContext.getContext();
+ }
+ return extValContext;
+ }
+
public static ExtValCoreConfiguration get()
{
- ExtValCoreConfiguration moduleConfig = extValContext.getModuleConfiguration(ExtValCoreConfiguration.class);
+ ExtValCoreConfiguration moduleConfig = getExtValContext().getModuleConfiguration(ExtValCoreConfiguration.class);
if(moduleConfig == null)
{
@@ -65,7 +80,7 @@ public abstract class ExtValCoreConfigur
@UsageInformation(UsageCategory.INTERNAL)
public static boolean use(ExtValCoreConfiguration config, boolean forceOverride)
{
- return extValContext.addModuleConfiguration(ExtValCoreConfiguration.class, config, forceOverride);
+ return getExtValContext().addModuleConfiguration(ExtValCoreConfiguration.class, config, forceOverride);
}
/*
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/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_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java?rev=979584&r1=979583&r2=979584&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java Tue Jul 27 08:20:56 2010
@@ -30,22 +30,37 @@ import org.apache.myfaces.extensions.val
@UsageInformation(UsageCategory.INTERNAL)
public abstract class ExtValBaseValidationModuleConfiguration implements ExtValModuleConfiguration
{
- private static ExtValContext extValContext = ExtValContext.getContext();
+ private static ExtValContext extValContext = null;
protected ExtValBaseValidationModuleConfiguration()
{
}
+ /**
+ * Don't access ExtValContext during initialization of the class. OpenWebBeans initializes all classes during
+ * startup of the WebContainer. extValContext constructor tries to access Web.xml parameters through FacesContext
+ * which isn't available yet.
+ * @return The ExtValContext
+ */
+ private static ExtValContext getExtValContext()
+ {
+ if (extValContext == null)
+ {
+ extValContext = ExtValContext.getContext();
+ }
+ return extValContext;
+ }
+
public static ExtValBaseValidationModuleConfiguration get()
{
- return extValContext.getModuleConfiguration(ExtValBaseValidationModuleConfiguration.class);
+ return getExtValContext().getModuleConfiguration(ExtValBaseValidationModuleConfiguration.class);
}
@UsageInformation(UsageCategory.INTERNAL)
public static boolean use(ExtValBaseValidationModuleConfiguration config, boolean forceOverride)
{
- return extValContext.addModuleConfiguration(
- ExtValBaseValidationModuleConfiguration.class, config, forceOverride);
+ return getExtValContext().addModuleConfiguration(ExtValBaseValidationModuleConfiguration.class, config,
+ forceOverride);
}
/*
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/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_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java?rev=979584&r1=979583&r2=979584&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java Tue Jul 27 08:20:56 2010
@@ -30,22 +30,37 @@ import org.apache.myfaces.extensions.val
@UsageInformation(UsageCategory.INTERNAL)
public abstract class ExtValCrossValidationModuleConfiguration implements ExtValModuleConfiguration
{
- private static ExtValContext extValContext = ExtValContext.getContext();
+ private static ExtValContext extValContext = null;
protected ExtValCrossValidationModuleConfiguration()
{
}
+ /**
+ * Don't access ExtValContext during initialization of the class. OpenWebBeans initializes all classes during
+ * startup of the WebContainer. extValContext constructor tries to access Web.xml parameters through FacesContext
+ * which isn't available yet.
+ * @return The ExtValContext
+ */
+ private static ExtValContext getExtValContext()
+ {
+ if (extValContext == null)
+ {
+ extValContext = ExtValContext.getContext();
+ }
+ return extValContext;
+ }
+
public static ExtValCrossValidationModuleConfiguration get()
{
- return extValContext.getModuleConfiguration(ExtValCrossValidationModuleConfiguration.class);
+ return getExtValContext().getModuleConfiguration(ExtValCrossValidationModuleConfiguration.class);
}
@UsageInformation(UsageCategory.INTERNAL)
public static boolean use(ExtValCrossValidationModuleConfiguration config, boolean forceOverride)
{
- return extValContext.addModuleConfiguration(
- ExtValCrossValidationModuleConfiguration.class, config, forceOverride);
+ return getExtValContext().addModuleConfiguration(ExtValCrossValidationModuleConfiguration.class, config,
+ forceOverride);
}
/*