craigmcc 2003/01/28 11:30:24
Modified: conf/share struts-config_1_1.dtd
doc/userGuide configuration.xml
src/share/org/apache/struts/action ActionServlet.java
RequestProcessor.java
src/share/org/apache/struts/config ControllerConfig.java
Log:
Deprecate the "debug" servlet init parameter. It is basically irrelevant
when you use commons-logging and configure underlying loggers.
Make it clearer that the controller servlet must be a singleton.
Revision Changes Path
1.35 +4 -3 jakarta-struts/conf/share/struts-config_1_1.dtd
Index: struts-config_1_1.dtd
===================================================================
RCS file: /home/cvs/jakarta-struts/conf/share/struts-config_1_1.dtd,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- struts-config_1_1.dtd 23 Dec 2002 22:00:24 -0000 1.34
+++ struts-config_1_1.dtd 28 Jan 2003 19:30:23 -0000 1.35
@@ -477,8 +477,9 @@
JSP, or other resource to which the request is forwarded.
["text/html"]
- debug Debugging detail level for this module.
- [0]
+ debug Debugging detail level for this module. [0]
+ DEPRECATED - configure the logging detail level
+ in your underlying logging implementation.
forwardPattern Replacement pattern defining how the "path" attribute of a
<forward> element is mapped to a context-relative URL when
1.16 +19 -25 jakarta-struts/doc/userGuide/configuration.xml
Index: configuration.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/configuration.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- configuration.xml 20 Jan 2003 00:03:22 -0000 1.15
+++ configuration.xml 28 Jan 2003 19:30:23 -0000 1.16
@@ -625,28 +625,12 @@
org.apache.struts.action.ActionServlet
</servlet-class>
<init-param>
- <param-name>application</param-name>
- <param-value>
- org.apache.struts.webapp.example.ApplicationResources
- </param-value>
- </init-param>
- <init-param>
<param-name>config</param-name>
<param-value>
/WEB-INF/struts-config.xml
</param-value>
</init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>2</param-value>
- </init-param>
- <init-param>
- <param-name>mapping</param-name>
- <param-value>
- org.apache.struts.webapp.example.ApplicationMapping
- </param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
+ <load-on-startup>1</load-on-startup>
</servlet>
]]></code></pre>
@@ -690,14 +674,6 @@
</li>
<li>
- <strong>debug</strong> - The debugging detail level that controls
- how much information is logged for this servlet.
- Accepts values 0 (off) and from 1 (least serious) through 6
- (most serious).
- [0]
- </li>
-
- <li>
<strong>rulesets</strong> - Comma-delimited list of fully qualified
classnames of additional
<code>org.apache.commons.digester.RuleSet</code> instances that
@@ -748,6 +724,15 @@
</li>
<li>
+ <strong>debug</strong> - The debugging detail level that controls
+ how much information is logged for this servlet.
+ Accepts values 0 (off) and from 1 (least serious) through 6
+ (most serious). [0]
+ <em>DEPRECATED - Configure the logging detail level in your
+ underlying logging implementation.</em>
+ </li>
+
+ <li>
<strong>factory</strong> - The Java class name of the
<code>MessageResourcesFactory</code> used to create the application
<code>MessageResources</code> object.
@@ -880,6 +865,15 @@
</li>
</ul>
+
+ <p>
+ <font color="red"><strong>WARNING</strong></font> - Struts will not
+ operate correctly if you define more than one
+ <code><servlet></code> element for a controller
+ servlet, or a subclass of the standard controller servlet class.
+ The controller servlet <strong>MUST</strong> be a web application
+ wide singleton.
+ </p>
</section>
1.142 +12 -7
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.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- ActionServlet.java 18 Jan 2003 19:43:00 -0000 1.141
+++ ActionServlet.java 28 Jan 2003 19:30:23 -0000 1.142
@@ -192,9 +192,6 @@
* when populating forms. If set to true, the numeric Java wrapper class types
* (like <code>java.lang.Integer</code>) will default to null (rather than 0).
* (Since Struts 1.1) [false] </li>
- * <li><strong>debug</strong> - TThe debugging detail level that controls how much
- * information is logged for this servlet. Accepts values 0 (off) and from
- * 1 (least serious) through 6 (most serious). [0]</li>
* <li><strong>rulesets</strong> - Comma-delimited list of fully qualified
* classnames of additional <code>org.apache.commons.digester.RuleSet</code>
* instances that should be added to the <code>Digester</code> that will
@@ -220,6 +217,11 @@
* servlet or JSP page. [text/html]
* <em>DEPRECATED - Configure this using the "contentType" attribute
* of the <controller> element.</em></li>
+ * <li><strong>debug</strong> - TThe debugging detail level that controls how much
+ * information is logged for this servlet. Accepts values 0 (off) and from
+ * 1 (least serious) through 6 (most serious). [0]
+ * <em>DEPRECATED - Configure the logging detail level in your
+ * underlying logging implementation.</li>
* <li><strong>factory</strong> - The Java class name of the
* <code>MessageResourcesFactory</code> used to create the application
* <code>MessageResources</code> object.
@@ -621,6 +623,9 @@
/**
* Return the debugging detail level for this servlet.
+ *
+ * @deprecated Configure the logging detail level in your underlying
+ * logging implementation
*/
public int getDebug() {
1.23 +7 -4
jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java
Index: RequestProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- RequestProcessor.java 12 Nov 2002 03:56:09 -0000 1.22
+++ RequestProcessor.java 28 Jan 2003 19:30:24 -0000 1.23
@@ -1068,6 +1068,9 @@
/**
* Return the debugging detail level that has been configured for our
* controller servlet.
+ *
+ * @deprecated Configure the logging detail level in your
+ * underlying logging implementation
*/
public int getDebug() {
1.12 +6 -4
jakarta-struts/src/share/org/apache/struts/config/ControllerConfig.java
Index: ControllerConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ControllerConfig.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ControllerConfig.java 28 Nov 2002 07:13:03 -0000 1.11
+++ ControllerConfig.java 28 Jan 2003 19:30:24 -0000 1.12
@@ -127,6 +127,8 @@
/**
* The debugging detail level that determines logging verbosity.
+ * @deprecated Configure the logging detail level in your underlying
+ * logging implemenation
*/
protected int debug = 0;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
