You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by pa...@apache.org on 2018/04/07 04:07:03 UTC
svn commit: r1828582 - in /myfaces/core/branches/2.3.x:
api/src/main/java/javax/faces/annotation/
impl/src/main/java/org/apache/myfaces/cdi/
impl/src/main/java/org/apache/myfaces/el/unified/
Author: paulnicolucci
Date: Sat Apr 7 04:07:02 2018
New Revision: 1828582
URL: http://svn.apache.org/viewvc?rev=1828582&view=rev
Log:
MYFACES-4221: FacesConfig.Version contains non spec defined values
Modified:
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/annotation/FacesConfig.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducerExtension.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/annotation/FacesConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/annotation/FacesConfig.java?rev=1828582&r1=1828581&r2=1828582&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/annotation/FacesConfig.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/annotation/FacesConfig.java Sat Apr 7 04:07:02 2018
@@ -39,8 +39,6 @@ public @interface FacesConfig
public static enum Version
{
- JSF_2_2,
- JSF_2_3,
- CURRENT
+ JSF_2_3
}
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducerExtension.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducerExtension.java?rev=1828582&r1=1828581&r2=1828582&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducerExtension.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducerExtension.java Sat Apr 7 04:07:02 2018
@@ -34,7 +34,7 @@ public class JsfArtifactProducerExtensio
<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> event, BeanManager beanManager)
{
FacesConfig facesConfig = event.getAnnotatedType().getAnnotation(FacesConfig.class);
- if (facesConfig != null && facesConfig.version() != FacesConfig.Version.JSF_2_2)
+ if (facesConfig != null && facesConfig.version() == FacesConfig.Version.JSF_2_3)
{
registerCdiProducers = true;
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java?rev=1828582&r1=1828581&r2=1828582&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java Sat Apr 7 04:07:02 2018
@@ -237,7 +237,7 @@ public class ResolverBuilderBase
{
return false;
}
- else if (FacesConfig.Version.JSF_2_2.ordinal() < version.ordinal())
+ else if (version.ordinal() >= FacesConfig.Version.JSF_2_3.ordinal())
{
return true;
}