sraeburn 2003/09/17 11:54:26 Modified: doc/userGuide struts-bean.xml struts-logic.xml struts-html.xml configuration.xml doc struts.css doc/stylesheets struts.xsl Log: Fix missing deprecation warnings on taglib docs. Revision Changes Path 1.18 +8 -6 jakarta-struts/doc/userGuide/struts-bean.xml Index: struts-bean.xml =================================================================== RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-bean.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- struts-bean.xml 11 Sep 2003 21:31:23 -0000 1.17 +++ struts-bean.xml 17 Sep 2003 18:54:25 -0000 1.18 @@ -440,9 +440,11 @@ <info> <p>Application-relative name (starting with a '/') of the web application resource to be dispatched, and whose response data is to be made - available as a bean. <strong>DEPRECATED - Use the "page" attribute - instead</strong>.</p> + available as a bean.</p> </info> + <deprecated> + Use the "page" attribute instead. + </deprecated> </attribute> <attribute> @@ -551,7 +553,7 @@ <code>MessageResources</code> object containing our messages is stored.</p> </info> - <default>Action.MESSAGES_KEY</default> + <default>Globals.MESSAGES_KEY</default> </attribute> <attribute> @@ -574,7 +576,7 @@ <p>The name of the session scope bean under which our currently selected <code>Locale</code> object is stored.</p> </info> - <default>Action.LOCALE_KEY</default> + <default>Globals.LOCALE_KEY</default> </attribute> <attribute> @@ -968,7 +970,7 @@ <code>MessageResources</code> object containing our messages is stored.</p> </info> - <default>Action.MESSAGES_KEY</default> + <default>Globals.MESSAGES_KEY</default> </attribute> <attribute> @@ -1070,7 +1072,7 @@ <p>The name of the session scope bean under which our currently selected <code>Locale</code> object is stored.</p> </info> - <default>Action.LOCALE_KEY</default> + <default>Globals.LOCALE_KEY</default> </attribute> <attribute> 1.16 +4 -4 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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- struts-logic.xml 11 Sep 2003 21:31:23 -0000 1.15 +++ struts-logic.xml 17 Sep 2003 18:54:25 -0000 1.16 @@ -950,9 +950,9 @@ <rtexprvalue>true</rtexprvalue> <info> <p>By default the tag will retrieve the request scope bean it will - iterate over from the <code>Action.ERROR_KEY</code> constant string, + iterate over from the <code>Globals.ERROR_KEY</code> constant string, but if this attribute is set to 'true' the request scope bean - will be retrieved from the <code>Action.MESSAGE_KEY</code> + will be retrieved from the <code>Globals.MESSAGE_KEY</code> constant string. Also if this is set to 'true', any value assigned to the name attribute will be ignored. </p> @@ -1007,9 +1007,9 @@ <rtexprvalue>true</rtexprvalue> <info> <p>By default the tag will retrieve the request scope bean it will - iterate over from the <code>Action.ERROR_KEY</code> constant string, + iterate over from the <code>Globals.ERROR_KEY</code> constant string, but if this attribute is set to 'true' the request scope bean - will be retrieved from the <code>Action.MESSAGE_KEY</code> + will be retrieved from the <code>Globals.MESSAGE_KEY</code> constant string. Also if this is set to 'true', any value assigned to the name attribute will be ignored. </p> 1.65 +15 -11 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.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- struts-html.xml 11 Sep 2003 21:31:23 -0000 1.64 +++ struts-html.xml 17 Sep 2003 18:54:25 -0000 1.65 @@ -992,7 +992,7 @@ <info> Name of the request scope bean under which our error messages have been stored. If not present, the name specified by the - <code>Action.ERROR_KEY</code> constant string will be used. + <code>Globals.ERROR_KEY</code> constant string will be used. </info> </attribute> @@ -2228,7 +2228,7 @@ </info> <deprecated> Creating a session is undesirable for apps that don't support them. Use the lang - attribute to acheive the same functionality without creating a session. + attribute to achieve the same functionality without creating a session. </deprecated> </attribute> @@ -2289,10 +2289,11 @@ <rtexprvalue>true</rtexprvalue> <info> <p>The alignment option for this image.</p> - <p>The alignment option for this image. The align attribute is - deprecated in HTML 4.x. The suggested alternative is to use CSS. - Please see http://www.w3.org/TR/REC-html40/struct/objects.html#h-13.7.4 for more details.</p> </info> + <deprecated> + The align attribute is deprecated in HTML 4.x. The suggested alternative is to use CSS. + Please see http://www.w3.org/TR/REC-html40/struct/objects.html#h-13.7.4 for more details. + </deprecated> </attribute> <attribute> @@ -2836,11 +2837,14 @@ <required>false</required> <rtexprvalue>true</rtexprvalue> <info> - <p><strong>DEPRECATED</strong> - This attribute is not defined - in the HTML 4.01 spec and will be removed in a future version of Struts. + <p> An image for people with low resolution graphics cards. </p> </info> + <deprecated> + This attribute is not defined in the HTML 4.01 spec and + will be removed in a future version of Struts. + </deprecated> </attribute> <attribute> @@ -3266,7 +3270,7 @@ <info> The <script> element will not contain a language attribute when this is set to false. The default is true but this property is ignored - in XHMTL mode. + in XHTML mode. </info> <since>Struts 1.2</since> </attribute> @@ -3884,7 +3888,7 @@ <info> Name of the bean in any scope under which our messages have been stored. If not present, the name specified by the - <code>Action.ERROR_KEY</code> constant string will be used. + <code>Globals.ERROR_KEY</code> constant string will be used. </info> </attribute> @@ -3925,9 +3929,9 @@ <rtexprvalue>true</rtexprvalue> <info> By default the tag will retrieve the bean it will - iterate over from the <code>Action.ERROR_KEY</code> constant string, + iterate over from the <code>Globals.ERROR_KEY</code> constant string, but if this attribute is set to 'true' the bean - will be retrieved from the <code>Action.MESSAGE_KEY</code> + will be retrieved from the <code>Globals.MESSAGE_KEY</code> constant string. Also if this is set to 'true', any value assigned to the name attribute will be ignored. </info> 1.28 +1 -1 jakarta-struts/doc/userGuide/configuration.xml Index: configuration.xml =================================================================== RCS file: /home/cvs/jakarta-struts/doc/userGuide/configuration.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- configuration.xml 10 Sep 2003 23:12:30 -0000 1.27 +++ configuration.xml 17 Sep 2003 18:54:25 -0000 1.28 @@ -787,7 +787,7 @@ <strong>locale</strong> - If set to <code>true</code>, and there is a user session, identify and store an appropriate <code>java.util.Locale</code> object (under the standard key - identified by <code>Action.LOCALE_KEY</code>) in the user's session + identified by <code>Globals.LOCALE_KEY</code>) in the user's session if there is not a Locale object there already. [true] <em>DEPRECATED - Configure this using the "locale" attribute of 1.6 +8 -0 jakarta-struts/doc/struts.css Index: struts.css =================================================================== RCS file: /home/cvs/jakarta-struts/doc/struts.css,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- struts.css 11 Sep 2003 21:31:24 -0000 1.5 +++ struts.css 17 Sep 2003 18:54:25 -0000 1.6 @@ -144,6 +144,10 @@ clear: both; } +.deprecated { + color: #FF0000; +} + .float-left { float: left; } @@ -158,6 +162,10 @@ .right{ text-align: right; +} + +.since { + font-style: italic; } .version { 1.15 +20 -6 jakarta-struts/doc/stylesheets/struts.xsl Index: struts.xsl =================================================================== RCS file: /home/cvs/jakarta-struts/doc/stylesheets/struts.xsl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- struts.xsl 11 Sep 2003 21:31:24 -0000 1.14 +++ struts.xsl 17 Sep 2003 18:54:25 -0000 1.15 @@ -268,6 +268,13 @@ <xsl:apply-templates select="info"/> + <xsl:if test="since"> + <p>Since: <xsl:value-of select="since"/></p> + </xsl:if> + <xsl:if test="deprecated"> + <p class="deprecated"><strong>DEPRECATED:</strong> <xsl:value-of select="deprecated"/></p> + </xsl:if> + <xsl:if test="./attribute"> <table class="tag-attributes"> <thead> @@ -285,6 +292,7 @@ </xsl:template> + <!-- Create the table of documentation for a tag --> <xsl:template match="attribute"> <tr> @@ -293,9 +301,15 @@ </td> <td> <xsl:apply-templates select="info"/> - <xsl:variable name="required"> - <xsl:value-of select="required"/> - </xsl:variable> + <xsl:if test="deprecated"> + <p class="deprecated"><strong>DEPRECATED:</strong> <xsl:value-of select="deprecated"/></p> + </xsl:if> + <xsl:if test="since"> + <p class="since">Since: <xsl:value-of select="since"/></p> + </xsl:if> + <xsl:if test="default"> + [<xsl:value-of select="default"/>] + </xsl:if> <xsl:if test="required='true'"> [Required] </xsl:if> @@ -305,8 +319,8 @@ </td> </tr> </xsl:template> - - + + <!-- Process an tag info section --> <xsl:template match="info"> <xsl:apply-templates/>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]