svn commit: r1520983 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rm...@apache.org]

Author: rmannibucau
Date: Mon Sep  9 08:01:42 2013
New Revision: 1520983

URL: http://svn.apache.org/r1520983
Log:
TOMEE-1026 trying to skip jaxws, jaxrs and jms if no implementation in the container

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java?rev=1520983&r1=1520982&r2=1520983&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java Mon Sep  9 08:01:42 2013
@@ -38,6 +38,11 @@ public class URLClassLoaderFirst extends
     // commons-net is only in tomee-plus
     private static final boolean SKIP_COMMONS_NET = skipLib("org.apache.commons.net.pop3.POP3Client");
 
+    // first skip container APIs if not in the jaxrs or plus version
+    private static final boolean SKIP_JAXRS = skipLib("org.apache.cxf.jaxrs.JAXRSInvoker");
+    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");
+
     // - will not match anything, that's the desired default behavior
     public static final Collection<String> FORCED_SKIP = new ArrayList<String>();
     public static final Collection<String> FORCED_LOAD = new ArrayList<String>();
@@ -335,6 +340,12 @@ public class URLClassLoaderFirst extends
     }
 
     private static boolean isInServer(final String name) {
+        if (name.startsWith("javax.")) {
+            final String sub = name.substring("javax.".length());
+            if (sub.startsWith("ws.rs.")) return SKIP_JAXRS;
+            if (sub.startsWith("jws.")) return SKIP_JAXWS;
+            if (sub.startsWith("jms.")) return SKIP_JMS;
+        }
         return ParentClassLoaderFinder.Helper.get().getResource(name.replace('.', '/') + ".class") != null;
     }
 

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1520983&r1=1520982&r2=1520983&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Mon Sep  9 08:01:42 2013
@@ -2033,7 +2033,7 @@ public class TomcatWebAppBuilder impleme
     private void safeBind(final Context comp, final String name, final Object value) {
         try {
             comp.lookup(name);
-            logger.info(name + " already bound, ignoring");
+            logger.debug(name + " already bound, ignoring");
         } catch (Exception e) {
             try {
                 comp.bind(name, value);