You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/02/12 20:42:31 UTC

svn commit: r1567737 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/config/ container/openejb-core/src/main/resources/ tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/

Author: rmannibucau
Date: Wed Feb 12 19:42:31 2014
New Revision: 1567737

URL: http://svn.apache.org/r1567737
Log:
TOMEE-1119 ensuring servlet path is right even in system classloader usage to avoid scanning issue in tomee

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
    tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1567737&r1=1567736&r2=1567737&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Wed Feb 12 19:42:31 2014
@@ -5339,6 +5339,8 @@ public class AnnotationDeployer implemen
                     } else {
                         list.add(classLocation(loadedClass).toExternalForm());
                     }
+                } else if (url.endsWith(".jar") && url.startsWith("file:")) {
+                    list.add("jar:" + url + "!/" + name.replace('.', '/') + ".class");
                 } else {
                     list.add(classLocation(loadedClass).toExternalForm());
                 }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions?rev=1567737&r1=1567736&r2=1567737&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions Wed Feb 12 19:42:31 2014
@@ -149,6 +149,7 @@ openejb-loader
 openejb-openwebbeans
 openejb-provisionning
 openejb-rest
+openejb-shade
 openejb-server
 openejb-webservices
 openjpa-
@@ -193,12 +194,19 @@ surefire-
 swizzle-
 sxc-
 testng-
+tomcat-annotations
 tomcat-api
+tomcat-catalina
 tomcat-coyote
 tomcat-dbcp
+tomcat-el
 tomcat-i18n
+tomcat-jasper
 tomcat-jdbc
+tomcat-jsp
 tomcat-juli
+tomcat-tribes
+tomcat-servlet
 tomcat-util
 tomee-
 tools.jar

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1567737&r1=1567736&r2=1567737&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Wed Feb 12 19:42:31 2014
@@ -615,7 +615,6 @@ public class OpenEJBContextConfig extend
         final File file = URLs.toFile(new URL(filePath));
 
         File current = classAsFile;
-        boolean webInf = false;
         while (current != null && current.exists()) {
             if (current.equals(file)) {
                 final File parent = current.getParentFile();
@@ -628,16 +627,21 @@ public class OpenEJBContextConfig extend
                 }
                 return true;
             }
-            if (current.getName().equals("WEB-INF")) {
-                webInf = true; // if class loaded from JVM classloader we'll not find it in the war
-            }
             current = current.getParentFile();
             if (BASE.equals(current)) {
                 return false;
             }
         }
 
-        return !(classAsFile != null && classAsFile.getName().endsWith(".jar") && file.getName().endsWith(".jar")) && !webInf;
+        return false;
+        /* classAsFile s
+        if (current != null && current.isDirectory()) {
+            return false;
+        }
+        return (classAsFile == null
+                    || !classAsFile.getName().endsWith(".jar") || !file.getName().endsWith(".jar"))
+                && !webInf;
+                */
 
     }
 }