Repository: deltaspike Updated Branches: refs/heads/master 6aceb6f34 -> 3d524def6
DELTASPIKE-1362 Very early JSF3.x support Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/3d524def Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/3d524def Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/3d524def Branch: refs/heads/master Commit: 3d524def6931ab36ab8e4a13c305fd3e98aa461b Parents: 6aceb6f Author: Thomas Andraschko <[email protected]> Authored: Thu Nov 22 11:28:42 2018 +0100 Committer: Thomas Andraschko <[email protected]> Committed: Thu Nov 22 11:28:42 2018 +0100 ---------------------------------------------------------------------- .../scope/mapped/MappedJsf2ScopeExtension.java | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3d524def/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/mapped/MappedJsf2ScopeExtension.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/mapped/MappedJsf2ScopeExtension.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/mapped/MappedJsf2ScopeExtension.java index 2f92d4c..854fb2a 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/mapped/MappedJsf2ScopeExtension.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/mapped/MappedJsf2ScopeExtension.java @@ -53,17 +53,21 @@ public class MappedJsf2ScopeExtension implements Extension, Deactivatable */ public MappedJsf2ScopeExtension() { - this.mappedJsfScopes.put(javax.faces.bean.ApplicationScoped.class, - javax.enterprise.context.ApplicationScoped.class); - this.mappedJsfScopes.put(javax.faces.bean.SessionScoped.class, - javax.enterprise.context.SessionScoped.class); - this.mappedJsfScopes.put(javax.faces.bean.RequestScoped.class, - javax.enterprise.context.RequestScoped.class); - - if (JsfUtils.isViewScopeDelegationEnabled()) + // skip on JSF3.x + if (ClassUtils.tryToLoadClassForName("javax.faces.bean.ApplicationScoped") != null) { - this.mappedJsfScopes.put(javax.faces.bean.ViewScoped.class, - ClassUtils.tryToLoadClassForName("javax.faces.view.ViewScoped")); + this.mappedJsfScopes.put(javax.faces.bean.ApplicationScoped.class, + javax.enterprise.context.ApplicationScoped.class); + this.mappedJsfScopes.put(javax.faces.bean.SessionScoped.class, + javax.enterprise.context.SessionScoped.class); + this.mappedJsfScopes.put(javax.faces.bean.RequestScoped.class, + javax.enterprise.context.RequestScoped.class); + + if (JsfUtils.isViewScopeDelegationEnabled()) + { + this.mappedJsfScopes.put(javax.faces.bean.ViewScoped.class, + ClassUtils.tryToLoadClassForName("javax.faces.view.ViewScoped")); + } } }
