You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/10 14:52:08 UTC
tomee git commit: TOMEE-1546 better classes to check jsf impl
packaging
Repository: tomee
Updated Branches:
refs/heads/master 2b385bb58 -> f71923445
TOMEE-1546 better classes to check jsf impl packaging
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f7192344
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f7192344
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f7192344
Branch: refs/heads/master
Commit: f71923445a0f5e6ad17f8432661a388b9e511ffa
Parents: 2b385bb
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Apr 10 14:51:45 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Apr 10 14:51:45 2015 +0200
----------------------------------------------------------------------
.../apache/openejb/util/classloader/URLClassLoaderFirst.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f7192344/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
index 8da406b..217b21f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
@@ -525,10 +525,11 @@ public class URLClassLoaderFirst extends URLClassLoader {
// using annotation to test to avoid to load more classes with deps
final String testClass;
- if ("javax.faces.bean.RequestScoped".equals(name)) {
- testClass = "javax.faces.bean.SessionScoped";
+ // these test classes have to be jsf 2.x AND 1.x otherwise we force JSF 2
+ if ("javax.faces.webapp.FacesServlet".equals(name)) {
+ testClass = "javax.faces.FactoryFinder";
} else {
- testClass = "javax.faces.bean.RequestScoped";
+ testClass = "javax.faces.webapp.FacesServlet";
}
final String classname = testClass.replace('.', '/') + ".class";