craigmcc 01/02/13 11:25:42
Modified: src/conf struts-config_1_0.dtd
src/share/org/apache/struts/action ActionServlet.java
Log:
Update comments in the DTD to reflect using initialization parameters in
the controller servlet for selecting the default implementation class for
ActionMapping, ActionFormBean, and ActionForward entries.
The "type" attribute on the <action-mappings>, <form-beans>, and
<global-forwards> elements are now deprecated.
Submitted by: Howard Moore <[EMAIL PROTECTED]>
PR: Bugzilla #586
Revision Changes Path
1.10 +20 -5 jakarta-struts/src/conf/struts-config_1_0.dtd
Index: struts-config_1_0.dtd
===================================================================
RCS file: /home/cvs/jakarta-struts/src/conf/struts-config_1_0.dtd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- struts-config_1_0.dtd 2001/02/13 18:59:36 1.9
+++ struts-config_1_0.dtd 2001/02/13 19:25:40 1.10
@@ -11,7 +11,7 @@
"-//Apache Software Foundation//DTD Struts Configuration 1.0//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_0.dtd">
- $Id: struts-config_1_0.dtd,v 1.9 2001/02/13 18:59:36 craigmcc Exp $
+ $Id: struts-config_1_0.dtd,v 1.10 2001/02/13 19:25:40 craigmcc Exp $
-->
@@ -154,7 +154,12 @@
for this application. The following attributes are defined:
type Fully qualified Java class name of the implementation
- class used for ActionFormBean objects.
+ class used for ActionFormBean objects. DEPRECATED.
+
+ WARNING: For Struts 1.0, this value is ignored. You
+ can set the default implementation class name with the
+ "formBean" initialization parameter to the Struts
+ controller servlet.
-->
<!ELEMENT form-beans (form-bean*)>
<!ATTLIST form-beans id ID #IMPLIED>
@@ -190,7 +195,12 @@
an "action" element. The following attribute are defined:
type Fully qualified Java class name of the implementation
- class used for ActionForward objects.
+ class used for ActionForward objects. DEPRECATED.
+
+ WARNING: For Struts 1.0, this value is ignored. You
+ can set the default implementation class name with the
+ "forward" initialization parameter to the Struts
+ controller servlet.
-->
<!ELEMENT global-forwards (forward*)>
<!ATTLIST global-forwards id ID #IMPLIED>
@@ -229,11 +239,16 @@
defined:
type Fully qualified Java class name of the ActionMapping
- implementation class to be used.
+ implementation class to be used. DEPRECATED.
+
+ WARNING: For Struts 1.0, this value is ignored. You
+ can set the default implementation class name with the
+ "mapping" initialization parameter to the Struts
+ controller servlet.
-->
<!ELEMENT action-mappings (action*)>
<!ATTLIST action-mappings id ID #IMPLIED>
-<!ATTLIST action-mappings type %ClassName;
"org.apache.struts.action.ActionMappingBase">
+<!ATTLIST action-mappings type %ClassName;
"org.apache.struts.action.ActionMapping">
<!-- The "action" element describes a mapping from a request paths to the
1.57 +4 -10
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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ActionServlet.java 2001/01/28 03:04:32 1.56
+++ ActionServlet.java 2001/02/13 19:25:41 1.57
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.56
2001/01/28 03:04:32 craigmcc Exp $
- * $Revision: 1.56 $
- * $Date: 2001/01/28 03:04:32 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.57
2001/02/13 19:25:41 craigmcc Exp $
+ * $Revision: 1.57 $
+ * $Date: 2001/02/13 19:25:41 $
*
* ====================================================================
*
@@ -228,7 +228,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.56 $ $Date: 2001/01/28 03:04:32 $
+ * @version $Revision: 1.57 $ $Date: 2001/02/13 19:25:41 $
*/
public class ActionServlet
@@ -1048,8 +1048,6 @@
// Configure the processing rules
- // FIXME "struts-config/action-mappings" type attribute
-
digester.addObjectCreate("struts-config/data-sources/data-source",
"org.apache.struts.util.GenericDataSource",
"type");
@@ -1084,8 +1082,6 @@
("struts-config/action-mappings/action/forward/set-property",
"property", "value");
- // FIXME "struts-config/form-beans" type attribute
-
digester.addObjectCreate("struts-config/form-beans/form-bean",
formBeanClass, "className");
digester.addSetProperties("struts-config/form-beans/form-bean");
@@ -1096,8 +1092,6 @@
digester.addSetProperty
("struts-config/form-beans/form-bean/set-property",
"property", "value");
-
- // FIXME "struts-config/global-forwards" type attribute
digester.addObjectCreate("struts-config/global-forwards/forward",
forwardClass, "className");
