svn commit: r1524324 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb: persistence/PersistenceBootstrap.java util/classloader/URLClassLoaderFirst.java

[rmannibucau]

Author: rmannibucau
Date: Wed Sep 18 08:02:58 2013
New Revision: 1524324

URL: http://svn.apache.org/r1524324
Log:
TOMEE-1030 skipping only packaged swizzle classes

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

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java?rev=1524324&r1=1524323&r2=1524324&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
 Wed Sep 18 08:02:58 2013
@@ -155,6 +155,7 @@ public class PersistenceBootstrap {
 
                     // Create entity manager factory
                     EntityManagerFactory emf = 
persistenceProvider.createContainerEntityManagerFactory(info, new HashMap());
+                    emf.close();
                     debug("success: " + provider);
                 } catch (Throwable e) {
                     debug("failed: " + provider, e);

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=1524324&r1=1524323&r2=1524324&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
 Wed Sep 18 08:02:58 2013
@@ -316,7 +316,13 @@ public class URLClassLoaderFirst extends
 
             // other org packages
             if (org.startsWith("hsqldb.") && SKIP_HSQLDB) return true;
-            if (org.startsWith("codehaus.swizzle")) return true;
+            if (org.startsWith("codehaus.swizzle.")) {
+                final String swizzle = 
org.substring("codehaus.swizzle.".length());
+                if (swizzle.startsWith("stream.")) return true;
+                if (swizzle.startsWith("rss.")) return true;
+                if (swizzle.startsWith("Grep.class") || 
swizzle.startsWith("Lexer.class")) return true;
+                return true;
+            }
             if (org.startsWith("w3c.dom")) return true;
             if (org.startsWith("quartz")) return true;
             if (org.startsWith("eclipse.jdt.")) return true;