craigmcc 2002/07/05 15:05:59
Modified: src/share/org/apache/struts/config ControllerConfig.java
conf/share struts-config_1_1.dtd
Log:
Update docs to reflect the server-relative --> context-relative change.
Revision Changes Path
1.6 +28 -12
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ControllerConfig.java 4 Jul 2002 00:05:48 -0000 1.5
+++ ControllerConfig.java 5 Jul 2002 22:05:58 -0000 1.6
@@ -143,12 +143,10 @@
/**
- * <p>The replacement pattern used to determine a server-relative URL
+ * <p>The replacement pattern used to determine a context-relative URL
* from a {@link ForwardConfig} element. The pattern may consist of any
* combination of the following markers and characters:</p>
* <ul>
- * <li><code><strong>$C</strong></code> - Replaced by the context path
- * of the current web-application.</li>
* <li><code><strong>$A</strong></code> - Replaced by the application
* prefix for the current subapplication.</li>
* <li><code><strong>$P</strong></code> - Replaced by the <code>path</code>
@@ -162,7 +160,7 @@
* </ul>
*
* <p>If this property is set to <code>null</code>, a default pattern of
- * <code>$C$A$P</code> is utilized, which is backwards compatible with
+ * <code>$A$P</code> is utilized, which is backwards compatible with
* the hard coded functionality in prior versions.</p>
*/
protected String forwardPattern = null;
@@ -177,6 +175,26 @@
/**
+ * <p>Should the <code>input</code> property of {@link ActionConfig}
+ * instances associated with this sub-application be treated as the
+ * name of a corresponding {@link ForwardConfig}. A <code>false</code>
+ * value treats them as a sub-application relative path (consistent
+ * with the hard coded behavior of earlier versions of Struts.</p>
+ *
+ * @since 1.1b2
+ */
+ protected boolean inputForward = false;
+
+ public boolean getInputForward() {
+ return (this.inputForward);
+ }
+
+ public void setInputForward(boolean inputForward) {
+ this.inputForward = inputForward;
+ }
+
+
+ /**
* Should we store a Locale object in the user's session if needed?
*/
protected boolean locale = false;
@@ -247,13 +265,11 @@
/**
- * <p>The replacement pattern used to determine a server-relative URL
+ * <p>The replacement pattern used to determine a context-relative URL
* from the <code>page</code> attribute of Struts tags and configuration
* properties. The pattern may consist of any combination of the
* following markers and characters:</p>
* <ul>
- * <li><code><strong>$C</strong></code> - Replaced by the context path
- * of the current web-application.</li>
* <li><code><strong>$A</strong></code> - Replaced by the application
* prefix for the current subapplication.</li>
* <li><code><strong>$P</strong></code> - Replaced by the <code>page</code>
@@ -267,7 +283,7 @@
* </ul>
*
* <p>If this property is set to <code>null</code>, a default pattern of
- * <code>$C$A$P</code> is utilized, which is backwards compatible with
+ * <code>$A$P</code> is utilized, which is backwards compatible with
* the hard coded functionality in prior versions.</p>
*/
protected String pagePattern = null;
1.21 +13 -7 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- struts-config_1_1.dtd 4 Jul 2002 00:05:47 -0000 1.20
+++ struts-config_1_1.dtd 5 Jul 2002 22:05:58 -0000 1.21
@@ -440,11 +440,10 @@
debug Debugging detail level for this application. [0]
forwardPattern Replacement pattern defining how the "path" attribute of
- a "forward" element is mapped to a server-relative URL
+ a "forward" element is mapped to a context-relative URL
when it starts with a slash (and when the contextRelative
property is false). This value may consist of any
combination of the following:
- - "$C" - Replaced by the context path of this webapp
- "$A" - Replaced by the app prefix of this subapp
- "$P" - Replaced by the "path" attribute of the
selected "forward" element
@@ -452,9 +451,16 @@
- "$x" - (Where "x" is any character not defined above)
Silently swallowed, reserved for future use
If not specified, the default forwardPattern is
- "$C$A$P", which is consistent with previous hard coded
+ "$A$P", which is consistent with previous hard coded
behavior of forwards.
+ inputForward Set to true if you want the "input" parameter of
+ "action" elements to be the name of a local or global
+ "forward" element used to calculate the ultimate URL.
+ Set to false (the default) to treat the "input" parameter
+ of "action" elements as a subapp-relative path to the
+ resource used for the input form.
+
locale Set to true if you want a Locale object stored in the
user's session if not already present. [true]
@@ -472,17 +478,16 @@
[false]
pagePattern Replacement pattern defining how the "page" attribute of
- custom tags that use it is mapped to a server-relative URL
+ custom tags using it is mapped to a context-relative URL
of the corresponding resource. This value may consist of
any combination of the following:
- - "$C" - Replaced by the context path of this webapp
- "$A" - Replaced by the app prefix of this subapp
- "$P" - Replaced by the value of the "page" attribute
- "$$" - Causes a literal dollar sign to be rendered
- "$x" - (Where "x" is any character not defined above)
Silently swallowed, reserved for future use
If not specified, the default forwardPattern is
- "$C$A$P", which is consistent with previous hard coded
+ "$A$P", which is consistent with previous hard coded
behavior of URL evaluation for "page" attributes.
processorClass The fully qualified Java class name of the
@@ -499,6 +504,7 @@
<!ATTLIST controller contentType CDATA #IMPLIED>
<!ATTLIST controller debug %Integer; #IMPLIED>
<!ATTLIST controller forwardPattern CDATA #IMPLIED>
+<!ATTLIST controller inputForward %Boolean; #IMPLIED>
<!ATTLIST controller locale %Boolean; #IMPLIED>
<!ATTLIST controller maxFileSize CDATA #IMPLIED>
<!ATTLIST controller multipartClass %ClassName; #IMPLIED>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
