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 2014/12/19 12:35:35 UTC

tomee git commit: in embedded mode jaxws and jms api shouldnt be scanned

Repository: tomee
Updated Branches:
  refs/heads/develop 222977136 -> e549c598e


in embedded mode jaxws and jms api shouldnt be scanned


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e549c598
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e549c598
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e549c598

Branch: refs/heads/develop
Commit: e549c598e4dff4aae5295d1dfb2ab2f295d8949f
Parents: 2229771
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Dec 19 12:35:17 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Dec 19 12:35:17 2014 +0100

----------------------------------------------------------------------
 .../apache/openejb/util/classloader/URLClassLoaderFirst.java    | 5 +++--
 tck/cdi-embedded/src/test/resources/failing.xml                 | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/e549c598/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 420abd8..1f7d7f9 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
@@ -45,6 +45,7 @@ public class URLClassLoaderFirst extends URLClassLoader {
     // first skip container APIs if not in the jaxrs or plus version
     private static final boolean SKIP_JAXWS = skipLib("org.apache.cxf.jaxws.support.JaxWsImplementorInfo");
     private static final boolean SKIP_JMS = skipLib("org.apache.activemq.broker.BrokerFactory");
+    private static final boolean EMBEDDED = "true".equals(SystemInstance.get().getProperty("openejb.embedded"));
 
     // - will not match anything, that's the desired default behavior
     public static final Collection<String> FORCED_SKIP = new ArrayList<>();
@@ -504,10 +505,10 @@ public class URLClassLoaderFirst extends URLClassLoader {
         if (name.startsWith("javax.")) {
             final String sub = name.substring("javax.".length());
             if (sub.startsWith("jws.")) {
-                return SKIP_JAXWS;
+                return SKIP_JAXWS || EMBEDDED;
             }
             if (sub.startsWith("jms.")) {
-                return SKIP_JMS;
+                return SKIP_JMS || EMBEDDED;
             }
         }
         return ParentClassLoaderFinder.Helper.get().getResource(name.replace('.', '/') + ".class") != null;

http://git-wip-us.apache.org/repos/asf/tomee/blob/e549c598/tck/cdi-embedded/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml
index d72a513..07f6081 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -18,7 +18,7 @@
 <suite name="CDI TCK" verbose="0">
   <test name="CDI TCK">
     <classes>
-      <class name="org.jboss.cdi.tck.tests.context.passivating.broken.decorator.enterprise.EnterpriseBeanWithNonPassivatingDecoratorTest"/>
+      <class name="org.jboss.cdi.tck.tests.context.passivating.dependency.resource.webservice.WebResourcePassivationCapableDependencyTest"/>
     </classes>
   </test>
 </suite>