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

[dblevins]

Author: dblevins
Date: Sun Jul 22 16:44:56 2012
New Revision: 1364351

URL: http://svn.apache.org/viewvc?rev=1364351&view=rev
Log:
Re-enable TOMEE-144 to see exactly which TCK tests fail

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=1364351&r1=1364350&r2=1364351&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 Jul 22 16:44:56 2012
@@ -19,13 +19,21 @@ package org.apache.tomee.catalina;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.deploy.WebXml;
 import org.apache.catalina.startup.ContextConfig;
+import org.apache.openejb.assembler.classic.WebAppInfo;
 import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
 import org.xml.sax.InputSource;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.net.URLClassLoader;
 
 public class OpenEJBContextConfig extends ContextConfig {
 
+    private static Logger logger = Logger.getInstance(LogCategory.OPENEJB, 
OpenEJBContextConfig.class);
+
     private TomcatWebAppBuilder.StandardContextInfo info;
 
     public OpenEJBContextConfig(TomcatWebAppBuilder.StandardContextInfo 
standardContextInfo) {
@@ -66,11 +74,10 @@ public class OpenEJBContextConfig extend
         super.parseWebXml(source, dest, fragment);
     }
 
-//    @Override
-    protected void DISABLE_processAnnotationsUrl(URL url, WebXml fragment, 
boolean handlesTypesOnly) {
-        /* between t7.0.28 and t7.0.29 the API changed and since we don't use 
it simply dont break the build
+    @Override
+    protected void processAnnotationsUrl(URL url, WebXml fragment) {
         if (SystemInstance.get().getOptions().get("tomee.tomcat.scan", false)) 
{
-            super.processAnnotationsUrl(url, fragment, handlesTypesOnly);
+            super.processAnnotationsUrl(url, fragment);
             return;
         }
 
@@ -79,7 +86,7 @@ public class OpenEJBContextConfig extend
 
             if (webAppInfo == null) {
                 logger.warning("WebAppInfo not found. " + info);
-                super.processAnnotationsUrl(url, fragment, handlesTypesOnly);
+                super.processAnnotationsUrl(url, fragment);
                 return;
             }
 
@@ -102,7 +109,7 @@ public class OpenEJBContextConfig extend
 
                 final InputStream inputStream = classUrl.openStream();
                 try {
-                    processAnnotationsStream(inputStream, fragment, 
handlesTypesOnly);
+                    processAnnotationsStream(inputStream, fragment);
                     logger.debug("Succeeded " + webAnnotatedClassName);
                 } catch (IOException e) {
                     e.printStackTrace();
@@ -114,6 +121,5 @@ public class OpenEJBContextConfig extend
         } catch (Exception e) {
             logger.error("OpenEJBContextConfig.processAnnotationsUrl: 
failed.", e);
         }
-        */
     }
 }