svn commit: r785451 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java

[db...@apache.org]

Author: dblevins
Date: Wed Jun 17 00:00:02 2009
New Revision: 785451

URL: http://svn.apache.org/viewvc?rev=785451&view=rev
Log:
Smarten up the TempClassLoader to automatically skip OpenEJB and OpenJPA annotations.

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=785451&r1=785450&r2=785451&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java Wed Jun 17 00:00:02 2009
@@ -87,7 +87,8 @@
          * 2. Since this class loader uses Class.forName to load classes starting with java, javax or sun, it cannot load javax.faces.FacesServlet
          * 3. Result is , AnnotationDeployer throws a ClassNotFoundException
          */
-        if ( !name.startsWith("javax.faces.") && ( name.startsWith("java.") || name.startsWith("javax.") || name.startsWith("sun."))) {
+        if (!name.startsWith("javax.faces.") && (name.startsWith("java.") || name.startsWith("javax.") || name.startsWith("sun.") ||
+                name.startsWith("org.apache.openejb.api.") || name.startsWith("org.apache.openjpa.persistence."))) {
             return Class.forName(name, resolve, getClass().getClassLoader());
         }
 //        ( && !name.startsWith("javax.faces.") )||