Author: markt
Date: Tue Dec 22 15:43:31 2009
New Revision: 893208
URL: http://svn.apache.org/viewvc?rev=893208&view=rev
Log:
Catalina only needs to know about JSP URL patterns. Jasper will take care of
the rest.
Removed:
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=893208&r1=893207&r2=893208&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Tue Dec 22
15:43:31 2009
@@ -261,29 +261,8 @@
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",
- "setUrlPattern", 0);
+ "addJspUrlPattern", 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=893208&r1=893207&r2=893208&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Tue Dec 22
15:43:31 2009
@@ -41,7 +41,6 @@
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;
@@ -276,13 +275,15 @@
public Map<String,String> getTaglibs() { return taglibs; }
// jsp-config/jsp-property-group
- private Set<JspPropertyGroup> jspPropertyGroups =
- new HashSet<JspPropertyGroup>();
- public void addJspPropertyGroup(JspPropertyGroup propertyGroup) {
- jspPropertyGroups.add(propertyGroup);
+ // 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);
}
- public Set<JspPropertyGroup> getJspPropertyGroups() {
- return jspPropertyGroups;
+ public Set<String> getJspUrlPatterns() {
+ return jspUrlPatterns;
}
// security-constraint
@@ -600,8 +601,8 @@
}
// Do this last as it depends on servlets
- for (JspPropertyGroup jspPropertyGroup : jspPropertyGroups) {
- context.addJspMapping(jspPropertyGroup.getUrlPattern());
+ for (String urlPattern : jspUrlPatterns) {
+ context.addJspMapping(urlPattern);
}
}
@@ -726,9 +727,9 @@
filters.putAll(temp.getFilters());
for (WebXml fragment : fragments) {
- for (JspPropertyGroup jspPropertyGroup :
fragment.getJspPropertyGroups()) {
+ for (String urlPattern : fragment.getJspUrlPatterns()) {
// Always additive
- addJspPropertyGroup(jspPropertyGroup);
+ addJspUrlPattern(urlPattern);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
