husted 2004/01/02 03:55:39 Modified: doc/faqs index.xml doc/userGuide dev_validator.xml struts-html.xml struts-logic.xml src/share/org/apache/struts/taglib/bean WriteTag.java src/share/org/apache/struts/taglib/nested NestedPropertyTag.java Log: Expand tinyurls. Revision Changes Path 1.15 +1 -1 jakarta-struts/doc/faqs/index.xml Index: index.xml =================================================================== RCS file: /home/cvs/jakarta-struts/doc/faqs/index.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- index.xml 11 Sep 2003 21:31:24 -0000 1.14 +++ index.xml 2 Jan 2004 11:55:38 -0000 1.15 @@ -109,7 +109,7 @@ <ul> <li> - <a href="http://tinyurl.com/6jnv">Struts Validator: Validating Two Fields Match</a> by Matt Raible + <a href="http://www.raibledesigns.com/page/rd/20030226#struts_validator_validating_two_fields">Struts Validator: Validating Two Fields Match</a> by Matt Raible </li> </ul> 1.40 +1 -1 jakarta-struts/doc/userGuide/dev_validator.xml Index: dev_validator.xml =================================================================== RCS file: /home/cvs/jakarta-struts/doc/userGuide/dev_validator.xml,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- dev_validator.xml 1 Jan 2004 16:46:28 -0000 1.39 +++ dev_validator.xml 2 Jan 2004 11:55:38 -0000 1.40 @@ -786,7 +786,7 @@ <section href="resources" name="Validator Resources"> <p> - <a href="http://tinyurl.com/6jnv"> + <a href="http://www.raibledesigns.com/page/rd/20030226#struts_validator_validating_two_fields"> <strong>Struts Validator: Validating Two Fields Match</strong></a> by Matt Raible. Howto article. </p> 1.67 +36 -0 jakarta-struts/doc/userGuide/struts-html.xml Index: struts-html.xml =================================================================== RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-html.xml,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- struts-html.xml 13 Dec 2003 21:14:01 -0000 1.66 +++ struts-html.xml 2 Jan 2004 11:55:38 -0000 1.67 @@ -3139,6 +3139,18 @@ </info> </attribute> + <attribute> + <name>useLocalEncoding</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>If set to <code>true</code>, LocalCharacterEncoding will be + used, that is, the characterEncoding set to the HttpServletResponse, + as prefered character encoding rather than UTF-8, when + URLEncoding is done on parameters of the URL.</p> + </info> + </attribute> + <attribute> <name>usemap</name> <required>false</required> @@ -3826,6 +3838,18 @@ </info> </attribute> + <attribute> + <name>useLocalEncoding</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>If set to <code>true</code>, LocalCharacterEncoding will be + used, that is, the characterEncoding set to the HttpServletResponse, + as prefered character encoding rather than UTF-8, when + URLEncoding is done on parameters of the URL.</p> + </info> + </attribute> + </tag> <tag> @@ -5733,6 +5757,18 @@ in the receiving Action.</p> </info> </attribute> + + <attribute> + <name>useLocalEncoding</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>If set to <code>true</code>, LocalCharacterEncoding will be + used, that is, the characterEncoding set to the HttpServletResponse, + as prefered character encoding rather than UTF-8, when + URLEncoding is done on parameters of the URL.</p> + </info> + </attribute> </tag> 1.17 +12 -0 jakarta-struts/doc/userGuide/struts-logic.xml Index: struts-logic.xml =================================================================== RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-logic.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- struts-logic.xml 17 Sep 2003 18:54:25 -0000 1.16 +++ struts-logic.xml 2 Jan 2004 11:55:38 -0000 1.17 @@ -1732,6 +1732,18 @@ </info> </attribute> + <attribute> + <name>useLocalEncoding</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>If set to <code>true</code>, LocalCharacterEncoding will be + used, that is, the characterEncoding set to the HttpServletResponse, + as prefered character encoding rather than UTF-8, when + URLEncoding is done on parameters of the URL.</p> + </info> + </attribute> + </tag> 1.32 +11 -10 jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java Index: WriteTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- WriteTag.java 1 Jan 2004 22:39:59 -0000 1.31 +++ WriteTag.java 2 Jan 2004 11:55:38 -0000 1.32 @@ -116,7 +116,7 @@ "org.apache.struts.taglib.bean.format.int"; /** - * The key to search default format string for float (double, BigDecimal) in + * The key to search default format string for float (double, BigDecimal) in * resources. */ public static final String FLOAT_FORMAT_KEY = @@ -197,7 +197,7 @@ } /** - * The format string to be used as format to convert + * The format string to be used as format to convert * value to String. */ protected String formatStr = null; @@ -290,7 +290,7 @@ /** * Retrieve format string from message bundle and return null if * message not found or message string. - * + * * @param formatKey value to use as key to search message in bundle * @exception JspException if a JSP exception has occurred */ @@ -319,9 +319,10 @@ * * When a format string is retrieved from the message resources, * <code>applyLocalizedPattern</code> is used. For more about localized - * patterns, see <http://tinyurl.com/33y54>. (To obtain the correct - * value for some characters, you may need to view the file in a - * hex editor and then use the Unicode escape form in the + * patterns, see + * <http://www.dei.unipd.it/corsi/fi2ae-docs/source/jdk1.1.7/src/java/text/resources/>. + * (To obtain the correct value for some characters, you may need to view + * the file in a hex editor and then use the Unicode escape form in the * property resources file.) * * @param valueToFormat value to process and convert to String 1.10 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java Index: NestedPropertyTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- NestedPropertyTag.java 31 Jul 2003 00:19:04 -0000 1.9 +++ NestedPropertyTag.java 2 Jan 2004 11:55:38 -0000 1.10 @@ -147,7 +147,7 @@ public int doEndTag() throws JspException { /* set the reference back */ HttpServletRequest request = (HttpServletRequest)pageContext.getRequest(); - if (originalNest == null) { + if (originalNest == null && originalName == null) { NestedPropertyHelper.deleteReference(request); } else { NestedPropertyHelper.setName(request, originalName);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]