craigmcc 2002/06/22 18:04:18
Modified: doc/userGuide building_controller.xml
src/share/org/apache/struts/action ActionServlet.java
Log:
Desupport the "validating" init parameter for the controller servlet. We
now rely on default values for some attributes defined in the DTD, but these
are ony processed when you do a validating parse (which is now done
unconditionally).
PR: Bugzilla #7807
Submitted by: David M. Karr <dmkarr at earthlink.net>
Revision Changes Path
1.15 +0 -2 jakarta-struts/doc/userGuide/building_controller.xml
Index: building_controller.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/building_controller.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- building_controller.xml 23 Jun 2002 00:41:34 -0000 1.14
+++ building_controller.xml 23 Jun 2002 01:04:18 -0000 1.15
@@ -489,8 +489,6 @@
application as a servlet context attribute]</li>
<li><strong>validate</strong> - Are we using the new configuration file
format? [true]</li>
- <li><strong>validating</strong> - Should we use a validating XML parse to
- process the configuration file (strongly recommended)? [true]</li>
</ul>
</section>
1.104 +5 -22
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- ActionServlet.java 15 Jun 2002 23:23:00 -0000 1.103
+++ ActionServlet.java 23 Jun 2002 01:04:18 -0000 1.104
@@ -265,8 +265,6 @@
* application as a servlet context attribute]
* <em>DEPRECATED - Configure this using the "tempDir" attribute of
* the <controller> element.</em></li>
- * <li><strong>validating</strong> - Should we use a validating XML parse to
- * process the configuration file (strongly recommended)? [true]</li>
* </ul>
*
* @author Craig R. McClanahan
@@ -371,13 +369,6 @@
protected String servletName = null;
- /**
- * Should we use a validating XML parser to read the configuration file?
- */
- protected boolean validating = true;
-
-
-
// ---------------------------------------------------- HttpServlet Methods
@@ -1004,7 +995,7 @@
configDigester = new Digester();
configDigester.setDebug(detail);
configDigester.setNamespaceAware(true);
- configDigester.setValidating(validating);
+ configDigester.setValidating(true);
configDigester.setUseContextClassLoader(true);
configDigester.addRuleSet(new ConfigRuleSet());
for (int i = 0; i < registrations.length; i += 2) {
@@ -1073,14 +1064,6 @@
detail = Integer.parseInt(value);
} catch (Throwable t) {
detail = 0;
- }
- value = getServletConfig().getInitParameter("validating");
- if (value != null) {
- if (value.equalsIgnoreCase("true") ||
- value.equalsIgnoreCase("yes"))
- validating = true;
- else
- validating = false;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
