svn commit: r1463568 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Apr  2 14:44:50 2013
New Revision: 1463568

URL: http://svn.apache.org/r1463568
Log:
if the url is a mock try to find class with a heuristic. This one is a maven one and could be improved.

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java?rev=1463568&r1=1463567&r2=1463568&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java Tue Apr  2 14:44:50 2013
@@ -253,8 +253,15 @@ public class LightweightWebAppBuilder im
     }
 
     private static Class<?> loadFromUrls(final ClassLoader loader, final String url, final String path) throws ClassNotFoundException {
+        final String classname;
+        if ("jar:file://!/WEB-INF/classes/".equals(url) && path.contains("classes/")) {
+            classname = path.substring(path.lastIndexOf("classes/") + "classes/".length());
+        } else {
+            classname = path.substring(url.length());
+        }
+
         try { // in WEB-INF/classes
-            return loader.loadClass(className(path.substring(url.length())));
+            return loader.loadClass(className(classname));
         } catch (ClassNotFoundException cnfe) { // in a dependency (jar)
             return loader.loadClass(className(path.substring(path.indexOf("!") + 2)));
         }