tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r894258 - in /tomcat/trunk/java/org/apache/catalina: deploy/JspPropertyGroup.java startup/WebRuleSet.java startup/WebXml.java
Date Mon, 28 Dec 2009 22:12:07 GMT
Author: markt
Date: Mon Dec 28 22:12:06 2009
New Revision: 894258

URL: http://svn.apache.org/viewvc?rev=894258&view=rev
Log:
Revert r893208. Catalina does have a requirement to access the full  jsp-property-group info

Added:
    tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
      - copied unchanged from r893207, tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
Modified:
    tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/WebXml.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=894258&r1=894257&r2=894258&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Mon Dec 28 22:12:06 2009
@@ -261,8 +261,29 @@
         digester.addRule(fullPrefix + "/jsp-config",
                          jspConfig);
 
+        digester.addObjectCreate(fullPrefix + "/jsp-config/jsp-property-group",
+                                 "org.apache.catalina.deploy.JspPropertyGroup");
+        digester.addSetNext(fullPrefix + "/jsp-config/jsp-property-group",
+                            "addJspPropertyGroup",
+                            "org.apache.catalina.deploy.JspPropertyGroup");
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/deferred-syntax-allowed-as-literal",
+                               "setDeferredSyntax", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/el-ignored",
+                               "setElIgnored", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/include-coda",
+                               "addIncludeCoda", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/include-prelude",
+                               "addIncludePrelude", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/is-xml",
+                               "setIsXml", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/page-encoding",
+                               "setPageEncoding", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/scripting-invalid",
+                               "setScriptingInvalid", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/trim-directive-whitespaces",
+                               "setTrimWhitespace", 0);
         digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/url-pattern",
-                               "addJspUrlPattern", 0);
+                               "setUrlPattern", 0);
 
         digester.addRule(fullPrefix + "/login-config",
                          loginConfig);

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebXml.java?rev=894258&r1=894257&r2=894258&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Mon Dec 28 22:12:06 2009
@@ -41,6 +41,7 @@
 import org.apache.catalina.deploy.ErrorPage;
 import org.apache.catalina.deploy.FilterDef;
 import org.apache.catalina.deploy.FilterMap;
+import org.apache.catalina.deploy.JspPropertyGroup;
 import org.apache.catalina.deploy.LoginConfig;
 import org.apache.catalina.deploy.MessageDestination;
 import org.apache.catalina.deploy.MessageDestinationRef;
@@ -275,15 +276,13 @@
     public Map<String,String> getTaglibs() { return taglibs; }
     
     // jsp-config/jsp-property-group
-    // URL pattern is the only attribute Catalina needs to know. Jasper handles
-    // all the others
-    private Set<String> jspUrlPatterns =
-        new HashSet<String>();
-    public void addJspUrlPattern(String urlPattern) {
-        jspUrlPatterns.add(urlPattern);
+    private Set<JspPropertyGroup> jspPropertyGroups =
+        new HashSet<JspPropertyGroup>();
+    public void addJspPropertyGroup(JspPropertyGroup propertyGroup) {
+        jspPropertyGroups.add(propertyGroup);
     }
-    public Set<String> getJspUrlPatterns() {
-        return jspUrlPatterns;
+    public Set<JspPropertyGroup> getJspPropertyGroups() {
+        return jspPropertyGroups;
     }
 
     // security-constraint
@@ -601,8 +600,8 @@
         }
 
         // Do this last as it depends on servlets
-        for (String urlPattern : jspUrlPatterns) {
-            context.addJspMapping(urlPattern);
+        for (JspPropertyGroup jspPropertyGroup : jspPropertyGroups) {
+            context.addJspMapping(jspPropertyGroup.getUrlPattern());
         }
     }
     
@@ -727,9 +726,9 @@
         filters.putAll(temp.getFilters());
 
         for (WebXml fragment : fragments) {
-            for (String urlPattern : fragment.getJspUrlPatterns()) {
+            for (JspPropertyGroup jspPropertyGroup : fragment.getJspPropertyGroups()) {
                 // Always additive
-                addJspUrlPattern(urlPattern);
+                addJspPropertyGroup(jspPropertyGroup);
             }
         }
 



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


Mime
View raw message