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

[rmannibucau]

Author: rmannibucau
Date: Tue Sep  4 17:54:34 2012
New Revision: 1380763

URL: http://svn.apache.org/viewvc?rev=1380763&view=rev
Log:
ability to load jaxrs api from webapp removing its filtering (jersey brings the 
api in core package)

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

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java?rev=1380763&r1=1380762&r2=1380763&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
 Tue Sep  4 17:54:34 2012
@@ -183,6 +183,7 @@ public class URLClassLoaderFirst extends
 
         if (name.startsWith("java.")) return true;
         if (name.startsWith("javax.faces.")) return false;
+        if (name.startsWith("javax.ws.rs.")) return false; // while 
jersey-core brings the api!
         if (name.startsWith("javax.")) return true;
         if (name.startsWith("sun.")) return true;
 

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java?rev=1380763&r1=1380762&r2=1380763&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
 Tue Sep  4 17:54:34 2012
@@ -169,7 +169,7 @@ public final class TomEEClassLoaderEnric
             "javax.jms.Queue", // JMS
             "javax.enterprise.context.ApplicationScoped", // CDI
             "javax.inject.Inject", // CDI
-            "javax.ws.rs.Path", // JAXRS
+            // "javax.ws.rs.Path", // JAXRS - commented since we manage to 
find why jersey-core brings the api!
             "javax.ejb.EJB", // EJB
             "javax.annotation.PostConstruct" // javax.annotation
     };