svn commit: r1505186 - in /tomcat/trunk/java/org/apache: jasper/servlet/JspCServletContext.java tomcat/util/descriptor/web/WebXml.java

[jboynes]

Author: jboynes
Date: Sat Jul 20 18:30:12 2013
New Revision: 1505186

URL: http://svn.apache.org/r1505186
Log:
Refactor construction of JspConfigDescriptor into WebXml and use from JspC

Modified:
    tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
    tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1505186&r1=1505185&r2=1505186&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Sat Jul 
20 18:30:12 2013
@@ -28,10 +28,8 @@ import java.util.EventListener;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Vector;
-
 import javax.servlet.Filter;
 import javax.servlet.FilterRegistration;
 import javax.servlet.FilterRegistration.Dynamic;
@@ -43,17 +41,11 @@ import javax.servlet.ServletRegistration
 import javax.servlet.SessionCookieConfig;
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.descriptor.JspConfigDescriptor;
-import javax.servlet.descriptor.JspPropertyGroupDescriptor;
-import javax.servlet.descriptor.TaglibDescriptor;
 
 import org.apache.jasper.JasperException;
 import org.apache.jasper.compiler.Localizer;
 import org.apache.jasper.util.ExceptionUtils;
 import org.apache.tomcat.util.descriptor.web.Constants;
-import org.apache.tomcat.util.descriptor.web.JspConfigDescriptorImpl;
-import org.apache.tomcat.util.descriptor.web.JspPropertyGroup;
-import org.apache.tomcat.util.descriptor.web.JspPropertyGroupDescriptorImpl;
-import org.apache.tomcat.util.descriptor.web.TaglibDescriptorImpl;
 import org.apache.tomcat.util.descriptor.web.WebXml;
 import org.apache.tomcat.util.descriptor.web.WebXmlParser;
 
@@ -95,7 +87,7 @@ public class JspCServletContext implemen
     private final WebXml webXml;
 
 
-    private final JspConfigDescriptorImpl jspConfigDescriptor;
+    private final JspConfigDescriptor jspConfigDescriptor;
 
     /**
      * Web application class loader.
@@ -139,26 +131,7 @@ public class JspCServletContext implemen
             throw new JasperException(e);
         }
 
-        Set<JspPropertyGroup> jspPropertyGroups = 
webXml.getJspPropertyGroups();
-        Map<String,String> tagLibs = webXml.getTaglibs();
-
-        if (jspPropertyGroups.isEmpty() && tagLibs.isEmpty()) {
-            jspConfigDescriptor = null;
-        } else {
-            jspConfigDescriptor = new JspConfigDescriptorImpl();
-            for (JspPropertyGroup jspPropertyGroup : jspPropertyGroups) {
-                JspPropertyGroupDescriptor descriptor =
-                        new JspPropertyGroupDescriptorImpl(jspPropertyGroup);
-                jspConfigDescriptor.getJspPropertyGroups().add(descriptor);
-
-            }
-            for (Entry<String, String> entry : webXml.getTaglibs().entrySet()) 
{
-                TaglibDescriptor descriptor = new TaglibDescriptorImpl(
-                        entry.getValue(), entry.getKey());
-                jspConfigDescriptor.getTaglibs().add(descriptor);
-            }
-        }
-
+        jspConfigDescriptor = webXml.getJspConfigDescriptor();
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1505186&r1=1505185&r2=1505186&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Sat Jul 
20 18:30:12 2013
@@ -31,6 +31,9 @@ import java.util.Set;
 
 import javax.servlet.ServletContext;
 import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
+import javax.servlet.descriptor.JspPropertyGroupDescriptor;
+import javax.servlet.descriptor.TaglibDescriptor;
 
 import org.apache.tomcat.util.descriptor.XmlIdentifiers;
 import org.apache.tomcat.util.res.StringManager;
@@ -557,6 +560,25 @@ public class WebXml {
         return preDestroyMethods;
     }
 
+    public JspConfigDescriptor getJspConfigDescriptor() {
+        if (jspPropertyGroups.isEmpty() && taglibs.isEmpty()) {
+            return null;
+        }
+        JspConfigDescriptorImpl jspConfigDescriptor = new 
JspConfigDescriptorImpl();
+        for (JspPropertyGroup jspPropertyGroup : jspPropertyGroups) {
+            JspPropertyGroupDescriptor descriptor =
+                    new JspPropertyGroupDescriptorImpl(jspPropertyGroup);
+            jspConfigDescriptor.getJspPropertyGroups().add(descriptor);
+
+        }
+        for (Entry<String, String> entry : taglibs.entrySet()) {
+            TaglibDescriptor descriptor = new TaglibDescriptorImpl(
+                    entry.getValue(), entry.getKey());
+            jspConfigDescriptor.getTaglibs().add(descriptor);
+        }
+        return jspConfigDescriptor;
+    }
+
     // Attributes not defined in web.xml or web-fragment.xml
 
     // URL of JAR / exploded JAR for this web-fragment



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org