Author: remy.maucherat(a)jboss.com Date: 2009-05-27 11:35:26 -0400 (Wed, 27 May 2009) New Revision: 1067 Modified: trunk/java/org/apache/catalina/Context.java trunk/java/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java trunk/java/org/apache/catalina/startup/WebRuleSet.java Log: - Add jsp-property-group rules. Modified: trunk/java/org/apache/catalina/Context.java =================================================================== --- trunk/java/org/apache/catalina/Context.java 2009-05-27 15:31:15 UTC (rev 1066) +++ trunk/java/org/apache/catalina/Context.java 2009-05-27 15:35:26 UTC (rev 1067) @@ -25,6 +25,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.NamingResources; import org.apache.catalina.deploy.SecurityConstraint; @@ -580,6 +581,14 @@ /** + * Add the given jsp-property-group. + * + * @param propertyGroup the property group which will be added + */ + public void addJspPropertyGroup(JspPropertyGroup propertyGroup); + + + /** * Add a Locale Encoding Mapping (see Sec 5.4 of Servlet spec 2.4) * * @param locale locale to map an encoding for Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2009-05-27 15:31:15 UTC (rev 1066) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-05-27 15:35:26 UTC (rev 1067) @@ -83,6 +83,7 @@ import org.apache.catalina.deploy.FilterMap; import org.apache.catalina.deploy.Injectable; import org.apache.catalina.deploy.InjectionTarget; +import org.apache.catalina.deploy.JspPropertyGroup; import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.deploy.MessageDestination; import org.apache.catalina.deploy.MessageDestinationRef; @@ -2264,6 +2265,17 @@ /** + * Add the given jsp-property-group. + * + * @param pattern URL pattern to be mapped + */ + public void addJspPropertyGroup(JspPropertyGroup propertyGroup) { + addJspMapping(propertyGroup.getUrlPattern()); + // FIXME: store locally to pass to the Jasper plugin later on + } + + + /** * Add a Locale Encoding Mapping (see Sec 5.4 of Servlet spec 2.4) * * @param locale locale to map an encoding for Modified: trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java =================================================================== --- trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java 2009-05-27 15:31:15 UTC (rev 1066) +++ trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java 2009-05-27 15:35:26 UTC (rev 1067) @@ -37,6 +37,8 @@ */ protected String uri; + protected ArrayList<String> listeners = new ArrayList<String>(); + /** * An array describing the tags that are defined in this tag library. */ @@ -163,5 +165,12 @@ return tags.toArray(new TagInfo[0]); } + public void addListener(String listener) { + listeners.add(listener); + } + + public String[] getListeners() { + return listeners.toArray(new String[0]); + } } Modified: trunk/java/org/apache/catalina/startup/WebRuleSet.java =================================================================== --- trunk/java/org/apache/catalina/startup/WebRuleSet.java 2009-05-27 15:31:15 UTC (rev 1066) +++ trunk/java/org/apache/catalina/startup/WebRuleSet.java 2009-05-27 15:35:26 UTC (rev 1067) @@ -244,8 +244,35 @@ digester.addCallParam(prefix + elementName + "/jsp-config/taglib/taglib-location", 1); digester.addCallParam(prefix + elementName + "/jsp-config/taglib/taglib-uri", 0); + digester.addObjectCreate(prefix + elementName + "/jsp-config/jsp-property-group", + "org.apache.catalina.deploy.JspPropertyGroup"); + digester.addSetNext(prefix + elementName + "/jsp-config/jsp-property-group", + "addJspPropertyGroup", "org.apache.catalina.deploy.JspPropertyGroup"); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/url-pattern", - "addJspMapping", 0); + "setUrlPattern", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/el-ignored", + "setElIgnored", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/page-encoding", + "setPageEncoding", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/scripting-invalid", + "setScriptingInvalid", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/is-xml", + "setIsXml", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/include-prelude", + "setIncludePrelude", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/include-coda", + "setIncludeCoda", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/deferred-syntax-allowed-as-literal", + "setDeferredSyntaxAllowedAsLiteral", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/trim-directive-whitespaces", + "setTrimDirectiveWhitespaces", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/default-content-type", + "setDefaultContentType", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/buffer", + "setBuffer", 0); + digester.addCallMethod(prefix + elementName + "/jsp-config/jsp-property-group/error-on-undeclared-namespace", + "setErrorOnUndeclaredNamespace", 0); digester.addCallMethod(prefix + elementName + "/listener/listener-class", "addApplicationListener", 0);