cmlenz 2003/06/10 04:45:13
Modified: integration/ant/src/java/org/apache/cactus/integration/ant
CactifyWarTask.java
Log:
More refactoring, less code
Revision Changes Path
1.19 +5 -15
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactifyWarTask.java
Index: CactifyWarTask.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactifyWarTask.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CactifyWarTask.java 10 Jun 2003 11:22:50 -0000 1.18
+++ CactifyWarTask.java 10 Jun 2003 11:45:13 -0000 1.19
@@ -722,27 +722,17 @@
// now add the default redirectors if they haven't been provided by
// the user
- if (!filterRedirectorDefined
- && (WebXmlVersion.V2_3.compareTo(webXml.getVersion()) <= 0))
+ if (!filterRedirectorDefined)
{
- // add the default filter redirector
- webXml.addFilter("FilterRedirector",
- FILTER_REDIRECTOR_CLASS);
- webXml.addFilterMapping("FilterRedirector",
- DEFAULT_FILTER_REDIRECTOR_MAPPING);
+ new FilterRedirector().mergeInto(webXml);
}
if (!servletRedirectorDefined)
{
- webXml.addServlet("ServletRedirector",
- SERVLET_REDIRECTOR_CLASS);
- webXml.addServletMapping("ServletRedirector",
- DEFAULT_SERVLET_REDIRECTOR_MAPPING);
+ new ServletRedirector().mergeInto(webXml);
}
if (!jspRedirectorDefined)
{
- webXml.addJspFile("JspRedirector", "/jspRedirector.jsp");
- webXml.addServletMapping("JspRedirector",
- DEFAULT_JSP_REDIRECTOR_MAPPING);
+ new JspRedirector().mergeInto(webXml);
}
return webXml;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
