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/03/09 21:26:29 UTC
svn commit: r921100 - in
/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator:
core/ core/renderkit/ util/
Author: gpetracek
Date: Tue Mar 9 20:26:29 2010
New Revision: 921100
URL: http://svn.apache.org/viewvc?rev=921100&view=rev
Log:
EXTVAL-87 workaround for mojarra
Modified:
myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java
myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java
myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java
myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/ProxyUtils.java
Modified: myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java?rev=921100&r1=921099&r2=921100&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java Tue Mar 9 20:26:29 2010
@@ -64,6 +64,9 @@ public interface WebXmlParameter
static final String CUSTOM_META_DATA_EXTRACTION_INTERCEPTOR = WebXmlUtils
.getInitParameter("CUSTOM_META_DATA_EXTRACTION_INTERCEPTOR");
+ static final String CUSTOM_PROXY_HELPER = WebXmlUtils
+ .getInitParameter("CUSTOM_PROXY_HELPER");
+
/*
* name mapper
*/
@@ -109,9 +112,6 @@ public interface WebXmlParameter
static final String CUSTOM_FACES_MESSAGE_FACTORY = WebXmlUtils
.getInitParameter("CUSTOM_FACES_MESSAGE_FACTORY");
- static final String CUSTOM_PROXY_HELPER = WebXmlUtils
- .getInitParameter("CUSTOM_PROXY_HELPER");
-
/*
* activate
*/
Modified: myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java?rev=921100&r1=921099&r2=921100&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java Tue Mar 9 20:26:29 2010
@@ -21,11 +21,11 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.factory.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.util.JsfUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.faces.render.RenderKit;
-import javax.faces.context.FacesContext;
/**
* Base for all RenderKitWrapperFactories to force a specific behaviour
@@ -112,9 +112,6 @@ public abstract class AbstractRenderKitW
*/
protected boolean isApplicationInitialized()
{
- return FacesContext.getCurrentInstance().getClass().getName().startsWith("org.apache.myfaces") ||
- FacesContext.getCurrentInstance().getExternalContext().getRequestMap() != null &&
- !FacesContext.getCurrentInstance().getExternalContext().getRequestMap().isEmpty();
-
+ return JsfUtils.isApplicationInitialized();
}
}
Modified: myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java?rev=921100&r1=921099&r2=921100&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java (original)
+++ myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java Tue Mar 9 20:26:29 2010
@@ -66,7 +66,7 @@ public class ExtValRenderKitFactory exte
{
RenderKit renderKit = this.wrapped.getRenderKit(facesContext, s);
- //jsf ri + trinidad
+ //for mojarra + trinidad
if(renderKit == null)
{
return null;
Modified: myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java?rev=921100&r1=921099&r2=921100&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java (original)
+++ myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java Tue Mar 9 20:26:29 2010
@@ -120,6 +120,17 @@ public class JsfUtils
return getFacesInformationStorage().getCurrentPhaseId();
}
+ /**
+ * simple test for early config in case of mojarra
+ * @return true if the jsf impl. is initialized and it's possible to use it as expected
+ */
+ public static boolean isApplicationInitialized()
+ {
+ return FacesContext.getCurrentInstance().getClass().getName().startsWith("org.apache.myfaces") ||
+ FacesContext.getCurrentInstance().getExternalContext().getRequestMap() != null &&
+ !FacesContext.getCurrentInstance().getExternalContext().getRequestMap().isEmpty();
+ }
+
private static FacesInformationStorage getFacesInformationStorage()
{
return ExtValUtils.getStorage(FacesInformationStorage.class, FacesInformationStorage.class.getName());
Modified: myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/ProxyUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/ProxyUtils.java?rev=921100&r1=921099&r2=921100&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/ProxyUtils.java (original)
+++ myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/util/ProxyUtils.java Tue Mar 9 20:26:29 2010
@@ -67,6 +67,12 @@ public class ProxyUtils
{
if (proxyHelper == null)
{
+ //workaround for mojarra
+ if(!JsfUtils.isApplicationInitialized())
+ {
+ return new DefaultProxyHelper();
+ }
+
proxyHelper = createProxyHelper();
}
return proxyHelper;