svn commit: r1310947 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

[db...@apache.org]

Author: dblevins
Date: Sun Apr  8 03:18:43 2012
New Revision: 1310947

URL: http://svn.apache.org/viewvc?rev=1310947&view=rev
Log:
Disabling fix for TOMEE-144 "Eliminate servlet-specific double scan" seems we have unrelated ear issues that prevent the fix from working as-is

Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1310947&r1=1310946&r2=1310947&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Sun Apr  8 03:18:43 2012
@@ -86,8 +86,8 @@ public class OpenEJBContextConfig extend
         super.parseWebXml(source, dest, fragment);
     }
 
-    @Override
-    protected void processAnnotationsUrl(URL url, WebXml fragment) {
+//    @Override
+    protected void DISABLE_processAnnotationsUrl(URL url, WebXml fragment) {
         if (SystemInstance.get().getOptions().get("tomee.tomcat.scan", false)) {
             super.processAnnotationsUrl(url, fragment);
             return;
@@ -102,6 +102,8 @@ public class OpenEJBContextConfig extend
                 return;
             }
 
+            logger.debug("Optimized Scan of URL " + url);
+
             // TODO We should just remember which jars each class came from
             // then we wouldn't need to lookup the class from the URL in this
             // way to guarantee we only add classes from this URL.
@@ -111,12 +113,16 @@ public class OpenEJBContextConfig extend
                 final URL classUrl = loader.getResource(classFile);
 
                 if (classUrl == null) {
+                    logger.debug("Not present " + webAnnotatedClassName);
                     continue;
                 }
 
+                logger.debug("Found " + webAnnotatedClassName);
+
                 final InputStream inputStream = classUrl.openStream();
                 try {
                     processAnnotationsStream(inputStream, fragment);
+                    logger.debug("Succeeded " + webAnnotatedClassName);
                 } catch (IOException e) {
                     e.printStackTrace();
                 } finally {