Change the TldProvider interface so that it returns tld entry with grouping

Kin Man Chung · Kin Man Chung · commit 7b562a919e92 · 2008-07-07T23:14:00.000Z
under the same jar name. This allows the implementation not to open the
jar too many times when there are multiple tld in a given jar.
Reviewed by Jan Luehe.


Original author: swchan2
Date: 2008-05-27 16:47:24.940543+00:00

svn path=/trunk/; revision=18
diff --git a/impl/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java b/impl/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java
@@ -41,8 +41,9 @@
 import java.net.URI;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Collections;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 import org.glassfish.api.web.TldProvider;
@@ -68,15 +69,15 @@ public class GlassFishTldProvider implements TldProvider, PostConstruct {
     @Inject
     ModulesRegistry registry;
 
-    private List<URL> tldList = Collections.emptyList();
- 
+    private Map<URL, List<String>> tldMap = new HashMap<URL, List<String>>();
+
     /**
-     * Get a list of URL that corresponding to Tld entries
+     * Get a Map with key URL and value as a list of tld entries.
      */
-    public URL[] getTldURLs() {
-        return tldList.toArray(new URL[tldList.size()]);
+    public Map<URL, List<String>> getTldMap() {
+        return (Map<URL, List<String>>)((HashMap)tldMap).clone();
     }
-
+ 
     public void postConstruct() {
         URL[] urls = null;
         Module m = registry.find(getClass());
@@ -102,9 +103,15 @@ public void postConstruct() {
                         "] is not of type URLClassLoader");
             }
         }
-        if (urls!=null) {
+
+        if (urls != null) {
             Pattern pattern = Pattern.compile("META-INF/.*\\.tld");
-            tldList =  JarURLPattern.getJarEntryURLs(urls, pattern);
+            for (URL url : urls) {
+                List entries =  JarURLPattern.getJarEntries(url, pattern);
+                if (entries != null && entries.size() > 0) {
+                    tldMap.put(url, entries);
+                }
+            }
         }
     }
 }
