martinc 01/11/03 23:43:51 Modified: src/share/org/apache/struts/action Tag: STRUTS_1_0_BRANCH ActionMapping.java src/share/org/apache/struts/taglib/html Tag: STRUTS_1_0_BRANCH package.html src/share/org/apache/struts/taglib/logic Tag: STRUTS_1_0_BRANCH package.html web/documentation Tag: STRUTS_1_0_BRANCH tags.html Log: Ported miscellaneous documentation fixes. PR: 4618, 4619, 4620, 4621, 4623, 4624 Submitted by: David M. Karr, Martin Cooper Revision Changes Path No revision No revision 1.17.2.2 +5 -5 jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java Index: ActionMapping.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -u -r1.17.2.1 -r1.17.2.2 --- ActionMapping.java 2001/10/04 03:01:18 1.17.2.1 +++ ActionMapping.java 2001/11/04 07:43:50 1.17.2.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java,v 1.17.2.1 2001/10/04 03:01:18 craigmcc Exp $ - * $Revision: 1.17.2.1 $ - * $Date: 2001/10/04 03:01:18 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java,v 1.17.2.2 2001/11/04 07:43:50 martinc Exp $ + * $Revision: 1.17.2.2 $ + * $Date: 2001/11/04 07:43:50 $ * * ==================================================================== * @@ -135,7 +135,7 @@ * selected by this <code>ActionMapping</code>. * <li><strong>path</strong> - Request URI path used to select this mapping. * If extension mapping is used for the controller servlet, the extension - * will be stripped before comparisions against this value are made. + * will be stripped before comparisons against this value are made. * <li><strong>prefix</strong> - Prefix used to match request parameter * names to form bean property names, if any. Replaces the old * <code>formPrefix</code> property. @@ -161,7 +161,7 @@ * </ul> * * @author Craig R. McClanahan - * @version $Revision: 1.17.2.1 $ $Date: 2001/10/04 03:01:18 $ + * @version $Revision: 1.17.2.2 $ $Date: 2001/11/04 07:43:50 $ */ public class ActionMapping implements Serializable { No revision No revision 1.5.2.2 +4 -4 jakarta-struts/src/share/org/apache/struts/taglib/html/package.html Index: package.html =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/package.html,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -r1.5.2.1 -r1.5.2.2 --- package.html 2001/06/11 16:01:56 1.5.2.1 +++ package.html 2001/11/04 07:43:50 1.5.2.2 @@ -84,7 +84,7 @@ </pre> </pre> -<p>Given this configuration, the HTML form tag for <code>input.jsp</code> will default +<p>Given this configuration, the HTML form tag for <code>logon.jsp</code> will default to using "<code>logonForm</code>" as its name property and "<code>org.apache.struts.example.LogonForm</code>" as the attribute's type. This way you can manage the namespace for your framework components from the configuration file.</p> @@ -321,7 +321,7 @@ <p>Most often, error messages are displayed in a particular way. To make it easy to format your messages, you can also specific an <code>errors.header</code> and <code>errors.footer</code> string in your message resource. Typically, you - might want to render the messages in a different color, or set them up them + might want to render the messages in a different color, or set them up to appear in an unordered list. Using the <code>errors.header</code> and <code>errors.footer</code> strings keeps the setup codes out of your JSP until a message actually prints.</p> <pre> @@ -379,7 +379,7 @@ holding the value using the <code>paramName</code> attribute, and a particular property using <code>paramProperty</code>. </p> <p>So, a tag like</p> -<pre> <html:link paramID="target" +<pre> <html:link paramId="target" paramName="linkParams" <br> paramProperty="target" paramScope="request"<br> >detail.html</html:link></pre> <p>would correspond to something like</p> @@ -392,7 +392,7 @@ named bean identifies a value that can be converted to a String. <p>To pass multiple dynamic parameters, you can store them in a <code><a href="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">java.util.Map</a></code>, and use the name of the map for the <code>paramName</code>. The map must then - contain one or more <code>paramIDs</code> and their corresponding values. As + contain one or more <code>paramIds</code> and their corresponding values. As the Map is processed, the keys are assumed to be the names of query parameters to be appended. The value associated with each key must be either a String or a String array representing the parameter value(s). If a String array is specified, No revision No revision 1.8.2.2 +28 -28 jakarta-struts/src/share/org/apache/struts/taglib/logic/package.html Index: package.html =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/package.html,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -r1.8.2.1 -r1.8.2.2 --- package.html 2001/05/29 18:04:43 1.8.2.1 +++ package.html 2001/11/04 07:43:50 1.8.2.2 @@ -31,8 +31,8 @@ <a name="doc.Functionality"></a> <h3>Logic Tag Functionality<a name="doc.Functionality"></a></h3> <p> The functionality of the logic tags can be divided into four groups:</p> -<p><b>Value Comparisions -</b> The purpose of these tags is to print out the body - of the tag if the comparision evaluates to <i>true. </i></p> +<p><b>Value Comparisons -</b> The purpose of these tags is to print out the body + of the tag if the comparison evaluates to <i>true. </i></p> <ul> <li><b><a href="../../../../../../struts-logic.html#equal">equal,</a> <a href="../../../../../../struts-logic.html#notEqual">notEqual</a></b> </li> @@ -59,26 +59,26 @@ <p>Each of the four groups of logic tags have a common set of attributes associated with them. :</p> <blockquote> - <p><b>Value Comparisions</b> (equal, notEqual, greaterEqual, lessEqual, greaterThan, + <p><b>Value Comparisons</b> (equal, notEqual, greaterEqual, lessEqual, greaterThan, lessThan, present, notPresent)</p> - <p>Each of the value comparision tags takes a <i>value</i> and compares it to - the value of a comparision attribute. If the value given can be successfully - converted to a <i>float</i> or <i>double</i>, then a number comparision is - performed on the value given and the value of the comparision attribute. Otherwise - a String comparision is performed. You have to specify one of the comparision + <p>Each of the value comparison tags takes a <i>value</i> and compares it to + the value of a comparison attribute. If the value given can be successfully + converted to a <i>float</i> or <i>double</i>, then a number comparison is + performed on the value given and the value of the comparison attribute. Otherwise + a String comparison is performed. You have to specify one of the comparison attributes: <i>cookie</i>, <i>header</i>, <i>parameter</i>, <i>property</i> - or <i>name. </i>For each of the examples, the tag "<i>someComparisionTag"</i>can - be replaced by any of the value comparision tags.</p> + or <i>name. </i>For each of the examples, the tag "<i>someComparisonTag"</i>can + be replaced by any of the value comparison tags.</p> <ul> <li>value - the value to which this tag is going to compare, used in conjunction - with one of the comparision attributes: <i>cookie</i>, <i>header</i>, <i>parameter</i>, + with one of the comparison attributes: <i>cookie</i>, <i>header</i>, <i>parameter</i>, <i>and property</i> and/or <i>name. </i></li> <li>cookie - the name of the cookie to compare to <i>value</i> <ul> <li>example: - <pre><logic:<i>someComparisionTag</i> value="someUserName" cookie="userName"> + <pre><logic:<i>someComparisonTag</i> value="someUserName" cookie="userName"> User Logged In -</logic:<i>someComparisionTag</i>> +</logic:<i>someComparisonTag</i>> </pre> </li> </ul> @@ -86,9 +86,9 @@ <li>header - the name of the HTTP header to compare to <i>value</i> <ul> <li>example: - <pre><logic:<i>someComparisionTag</i> value="en_US" header="Accept-Language"> + <pre><logic:<i>someComparisonTag</i> value="en_US" header="Accept-Language"> Welcome English-speaking User* -</logic:<i>someComparisionTag</i>> +</logic:<i>someComparisonTag</i>> </pre> </li> <li> @@ -107,9 +107,9 @@ pageContext.setAttribute("testString", testString, PageContext.PAGE_SCOPE); %> <jsp:useBean id="testString" scope="page" type="java.lang.String" /> -<logic:<i>someComparisionTag</i> name="testString" value="pantalones"> +<logic:<i>someComparisonTag</i> name="testString" value="pantalones"> Usted tiene pantalones! -</logic:<i>someComparision</i>> +</logic:<i>someComparison</i>> </pre> </li> </ul> @@ -117,9 +117,9 @@ <li>parameter - the name of the request parameter to compare to <i>value</i> <ul> <li>example: - <pre><logic:<i>someComparisionTag</i> value="" parameter="username"> + <pre><logic:<i>someComparisonTag</i> value="" parameter="username"> Error: a username must be specified -</logic:<i>someComparisionTag</i>> +</logic:<i>someComparisonTag</i>> </pre> </li> </ul> @@ -136,8 +136,8 @@ scope" </li> </ul> <p><b>Substring Matching</b> (match, notMatch)</p> - <p>The substring matching tags take all the same arguments as the value comparision - tags. You compare the String specified by <i>value</i> to any of the comparision + <p>The substring matching tags take all the same arguments as the value comparison + tags. You compare the String specified by <i>value</i> to any of the comparison values you give it, specified by <i>cookie</i>, <i>header</i>, <i>parameter</i>, <i>property</i> or <i>name.</i> Note that in the examples, <i>matchTag</i> corresponds either the <i>match </i>or <i>notMatch</i> tag. Matching tags @@ -149,13 +149,13 @@ matched to the end of the String <ul> <li>example: - <pre><logic:<i>matchTag</i> parameter="action" value="processLogin"> + <pre><logic:<i>matchTag</i> parameter="action" value="processLogin" location="start"> Processing Login.... </logic:<i>matchTag</i>> -Basically, in this short example, a request parameter "action" -was compared to see if it was equal to the String value "processLogin". -In this case, <i>matchTag</i> would have to be <logic:match>. +In this example, a request parameter "action" was compared to see if +its value started with the String "processLogin". In this case, +<i>matchTag</i> would have to be <logic:match>. </pre> </li> </ul> @@ -183,7 +183,7 @@ <li>name - The logical name of the ActionForward to use</li> </ul> <p><b>Collection Utilities</b> (iterate)</p> - <p>The <i>iterate</i> tag is responsible for executing it's body content once + <p>The <i>iterate</i> tag is responsible for executing its body content once for every element inside of the specified Collection. There is one required attribute:</p> <ul> @@ -280,7 +280,7 @@ </blockquote> <h3>Logic Examples</h3> <blockquote> - <p><b>Value Comparisions</b></p> + <p><b>Value Comparisons</b></p> <blockquote> <p><u></u><u></u><u>Logic Equivalence Tags (equal, notEqual, greaterEqual, lessEqual, lessThan, greaterThan)</u></p> @@ -339,7 +339,7 @@ is higher or lower than 7, and prints out a hint. As said before, this is a horribly designed small application, with no validity checks on the number input, but shows the basic usage of the logic equal tags</p> - <p>For String comparisions, the equal tags use the java.lang.String.compareTo() + <p>For String comparisons, the equal tags use the java.lang.String.compareTo() method. See the javadocs on the compareTo() method for more information, located <a href="http://www.javasoft.com/products/jdk/1.2/docs/api/java/lang/String.html#compareTo(java.lang.Object)">here</a>.</p> </blockquote> No revision No revision 1.25.2.1 +1 -1 jakarta-struts/web/documentation/Attic/tags.html Index: tags.html =================================================================== RCS file: /home/cvs/jakarta-struts/web/documentation/Attic/tags.html,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -u -r1.25 -r1.25.2.1 --- tags.html 2001/01/10 07:35:18 1.25 +++ tags.html 2001/11/04 07:43:50 1.25.2.1 @@ -1247,7 +1247,7 @@ <p>Repeats the body of this tag once for each element of a collection, which must be an <code>Iterator</code>, a <code>Collection</code> (which includes Lists, Sets, and Vectors), a <code>Map</code> (which includes Hashtables) -whose elements will be interated over, or an array of objects. The collection +whose elements will be iterated over, or an array of objects. The collection to be iterated over is identified by the <code>name</code> or <code>name</code> and <code>property</code> attributes, and the element being processed is exposed
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>