svn commit: r1579985 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java

[rm...@apache.org]

Author: rmannibucau
Date: Fri Mar 21 17:13:53 2014
New Revision: 1579985

URL: http://svn.apache.org/r1579985
Log:
TOMEE-1147 tld in web-inf/classes/meta-inf

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java?rev=1579985&r1=1579984&r2=1579985&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java Fri Mar 21 17:13:53 2014
@@ -23,6 +23,7 @@ import org.apache.xbean.finder.UrlSet;
 import org.apache.xbean.finder.filter.Filters;
 
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -44,6 +45,7 @@ import java.util.concurrent.Future;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
+import static java.util.Arrays.asList;
 import static org.apache.openejb.config.NewLoaderLogic.applyBuiltinExcludes;
 import static org.apache.openejb.util.URLs.toFile;
 
@@ -180,6 +182,16 @@ public class TldScanner {
                 files.add(file);
             }
         }
+        final File webInfMetaInf = new File(webInfDir, "classes/META-INF");
+        if (webInfMetaInf.exists()) {
+            // filter directly to let it be faster in next loop
+            files.addAll(asList(webInfMetaInf.listFiles(new FilenameFilter() {
+                @Override
+                public boolean accept(final File dir, final String name) {
+                    return name.endsWith(".tld");
+                }
+            })));
+        }
 
         if (files.isEmpty()) {
             return urls;