sraeburn 2003/09/05 16:58:23
Modified: doc/userGuide struts-bean.xml struts-tiles.xml dev_tiles.xml
struts-html.xml struts-nested.xml
doc/stylesheets userGuide.xsl
Log:
Update taglib docs to XHTML 1.0 Transitional
Revision Changes Path
1.15 +1 -2 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- struts-bean.xml 30 Aug 2003 23:19:20 -0000 1.14
+++ struts-bean.xml 5 Sep 2003 23:58:23 -0000 1.15
@@ -941,7 +941,7 @@
<bodycontent>empty</bodycontent>
<info>
<p>Retrieve the value of the specified bean property, and render it to the
- current JspWriter as a String by the ways:
+ current JspWriter as a String by the ways:</p>
<ul>
<li>If <code>format</code> attribute exists then value will be formatted on
base of format
string from <code>format</code> attribute and default system locale.</li>
@@ -954,7 +954,6 @@
<code>getAsText()</code> method will be called.</li>
<li>Otherwise, the usual <code>toString()</code> conversions will be
applied.</li>
</ul>
- </p>
<p>If a problem occurs while retrieving the specified bean property, a
request time exception will be thrown.</p>
1.9 +50 -48 jakarta-struts/doc/userGuide/struts-tiles.xml
Index: struts-tiles.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-tiles.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- struts-tiles.xml 1 Apr 2003 02:08:16 -0000 1.8
+++ struts-tiles.xml 5 Sep 2003 23:58:23 -0000 1.9
@@ -19,14 +19,12 @@
<display-name>Tiles Tag Library</display-name>
<uri>http://jakarta.apache.org/struts/tags-tiles</uri>
<info>
- This tag library provides tiles tags.
- <br></br>
- <br></br>
- Tiles were previously called Components. For historical reasons, names, pages,
components and templates
+ <p>This tag library provides tiles tags.</p>
+ <p>Tiles were previously called Components. For historical reasons, names,
pages, components and templates
are used indifferently to design a tile. Also, a lot of tags and attribute
names are
- left for backward compatibility.
- <br></br>To know more about tags defined in this library, check the associated
documentation:
- tiles-doc.
+ left for backward compatibility.</p>
+ <p>To know more about tags defined in this library, check the associated
documentation:
+ tiles-doc.</p>
</info>
<!-- ===================== Include Tags ====================== -->
@@ -37,32 +35,34 @@
Insert a tiles/component/template.
</summary>
<info>
- Insert a tiles/component/template with the possibility to pass parameters
+ <p>Insert a tiles/component/template with the possibility to pass parameters
(called attribute).
A tile can be seen as a procedure that can take parameters or attributes.
<code><template:insert></code> allows to define these attributes and pass
them to the inserted jsp page,
called template.
Attributes are defined using nested tag <code><template:put></code> or
<code><template:putList></code>.
- <br></br>
+ </p>
+ <p>
You must specify one of this tag attribute :
+ </p>
<ul>
<li><code>template</code>, for inserting a tiles/component/template page,</li>
<li><code>component</code>, for inserting a tiles/component/template page,
(same as template)</li>
<li><code>page</code> for inserting a JSP page, (same as template)</li>
<li><code>definition</code>, for inserting a definition from definitions
factory</li>
<li><code>attribute</code>, surrounding tiles's attribute name whose value is
used.
- <br>If attribute is associated to 'direct' flag (see put), and flag is
true, write
+ <br/>If attribute is associated to 'direct' flag (see put), and flag is
true, write
attribute value (no insertion).
- </br></li>
+ </li>
<li><code>name</code>, to let 'insert' determine the type of entities to
insert. In this later
case, search is done in this order : definitions, tiles/components/templates,
pages.
</li>
</ul>
- <br></br>
+ <p>
In fact, Page, component and template, are equivalent as a tile, component or
template are jsp page.
- <br></br>
- <STRONG>Example : </STRONG>
+ </p>
+ <p><strong>Example : </strong></p>
<pre><code>
<template:insert page="/basic/myLayout.jsp" flush="true">
<template:put name="title" value="My first page" />
@@ -80,8 +80,8 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<info>
- A string representing the URI of a tile or template (a JSP page).
- <br></br>'page', 'component' and 'template' are synonyms : they have
exactly the same behavior.
+ <p>A string representing the URI of a tile or template (a JSP page).</p>
+ <p>'page', 'component' and 'template' are synonyms : they have exactly the
same behavior.</p>
</info>
</attribute>
@@ -90,8 +90,8 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<info>
- Path (relative or absolute to webapps) of the component to insert.
- <br></br>'page', 'component' and 'template' are synonyms : they have
exactly the same behavior.
+ <p>Path (relative or absolute to webapps) of the component to insert.</p>
+ <p>'page', 'component' and 'template' are synonyms : they have exactly the
same behavior.</p>
</info>
</attribute>
@@ -100,8 +100,8 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<info>
- Path (relative or absolute to webapps) of the page to insert.
- <br></br>'page', 'component' and 'template' are synonyms : they have
exactly the same behavior.
+ <p>Path (relative or absolute to webapps) of the page to insert.</p>
+ <p>'page', 'component' and 'template' are synonyms : they have exactly the
same behavior.</p>
</info>
</attribute>
@@ -141,12 +141,12 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<info>
- Name of the bean used as value. Bean is retrieved from specified context, if
any. Otherwise,
+ <p>Name of the bean used as value. Bean is retrieved from specified context,
if any. Otherwise,
method pageContext.findAttribute is used.
- If beanProperty is also specified, retrieve value from the corresponding bean
property.
- <br></br>If found bean (or property value) is instance of one of Attribute
class (Direct,
+ If beanProperty is also specified, retrieve value from the corresponding bean
property.</p>
+ <p>If found bean (or property value) is instance of one of Attribute class
(Direct,
Instance, ...), insertion is done according to the class type. Otherwise, the
toString method is
- called on the bean, and returned String is used as name to insert (see 'name'
attribute).
+ called on the bean, and returned String is used as name to insert (see 'name'
attribute).</p>
</info>
</attribute>
@@ -206,11 +206,12 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<info>
- Url of a controller called immediately before page is inserted.<br></br>
+ <p>Url of a controller called immediately before page is inserted.</p>
+ <p>
Url usually denote a Struts action. Controller (action) is used to prepare
data
to be render by inserted Tile.
- <br></br>
- See also controlerClass. Only one of controllerUrl or controllerClass should
be used.
+ </p>
+ <p>See also controlerClass. Only one of controllerUrl or controllerClass
should be used.</p>
</info>
</attribute>
@@ -219,19 +220,18 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<info>
- Class type of a controller called immediately before page is
inserted.<br></br>
- Controller is used to prepare data to be render by inserted Tile.
- <br></br>
- See also controlerUrl
- <br></br>
- Class must implements or extends one of the following :
+ <p>Class type of a controller called immediately before page is inserted.</p>
+ <p>Controller is used to prepare data to be render by inserted Tile.</p>
+ <p>See also controlerUrl</p>
+ <p>Class must implements or extends one of the following :</p>
<ul>
<li>org.apache.struts.tiles.Controller</li>
<li>org.apache.struts.tiles.ControllerSupport</li>
<li>org.apache.struts.action.Action (wrapper
org.apache.struts.action.ActionController is used)</li>
</ul>
- <br></br>
+ <p>
See also controllerUrl. Only one of controllerUrl or controllerClass should
be used.
+ </p>
</info>
</attribute>
@@ -327,8 +327,8 @@
<li>definition : Content come from specified definition (from factory). Name
is used as definition name.</li>
</ul>
If type is specified, it is taken into account by 'get' or 'insert' inside
the inserted tile.
- <br></br>If 'type' attribute is not specified, content is 'untyped', unless
it comes from a typed bean.
- <br></br>Note that using 'direct="true"' is equivalent to 'type="string"'.
+ <p>If 'type' attribute is not specified, content is 'untyped', unless it
comes from a typed bean.</p>
+ <p>Note that using 'direct="true"' is equivalent to 'type="string"'.</p>
</info>
<tagclass>org.apache.struts.taglib.tiles.PutTag</tagclass>
<bodycontent>JSP</bodycontent>
@@ -563,10 +563,10 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<info>
- If the user is in the specified role, the tag is taken into account;
- otherwise, the tag is ignored (skipped).
- <br></br>
- The role isn't taken into account if <add> tag is used in a definition.
+ <p>If the user is in the specified role, the tag is taken into account;
+ otherwise, the tag is ignored (skipped).</p>
+ <p>
+ The role isn't taken into account if <add> tag is used in a
definition.</p>
</info>
</attribute>
@@ -582,8 +582,8 @@
<tagclass>org.apache.struts.taglib.tiles.GetTag</tagclass>
<bodycontent>empty</bodycontent>
<info>
- Retrieve content from tile context and include it.
- <br></br>Take into account the 'type' attribute.
+ <p>Retrieve content from tile context and include it.</p>
+ <p>Take into account the 'type' attribute.</p>
</info>
<attribute>
@@ -635,7 +635,7 @@
<info>
Retrieve the value of the specified tile/component/template attribute
property, and render it to the current JspWriter as a String.
The usual toString() conversions is applied on found value.
- <br></br>Throw a JSPException if named value is not found.
+ <p>Throw a JSPException if named value is not found.</p>
</info>
<tagclass>org.apache.struts.taglib.tiles.GetAttributeTag</tagclass>
<bodycontent>empty</bodycontent>
@@ -677,11 +677,13 @@
Use attribute value inside page.
</summary>
<info>
+ <p>
Declare a Java variable, and an attribute in the specified scope, using tile
attribute value.
- <br>
+ </p>
+ <p>
Java variable and attribute will have the name specified by 'id', or the
original name if not
specified.
- </br>
+ </p>
</info>
<tagclass>org.apache.struts.taglib.tiles.UseAttributeTag</tagclass>
<teiclass>org.apache.struts.taglib.tiles.UseAttributeTei</teiclass>
@@ -781,8 +783,8 @@
Initialize Tile/Component definitions factory.
</summary>
<info>
- Initialize Tile/Components definitions factory.
- <br>
+ <p>Initialize Tile/Components definitions factory.</p>
+ <p>
In order to use Tile/Component definitions factory, you need to initialize
the factory.
This is generally done in a initializing servlet. In particular, it is done in
"ComponentActionServlet" if you use it.
@@ -790,7 +792,7 @@
to provide the description file name, and optionally the factory classname.
Initialization is done only once, at the first call of this tag. Subsequent
calls
are ignored (tag checks existence of the factory.
- </br>
+ </p>
</info>
<tagclass>org.apache.struts.taglib.tiles.InitDefinitionsTag</tagclass>
<bodycontent>empty</bodycontent>
1.16 +3 -3 jakarta-struts/doc/userGuide/dev_tiles.xml
Index: dev_tiles.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/dev_tiles.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dev_tiles.xml 8 Jul 2003 00:30:33 -0000 1.15
+++ dev_tiles.xml 5 Sep 2003 23:58:23 -0000 1.16
@@ -115,7 +115,6 @@
<li>
Internationalization (I18N)
-</li>
<ul>
<li>
@@ -126,10 +125,10 @@
A mechanism similar to Java properties files is used for definition files: you can
have one definition file per Locale, the appropriate definition is loaded according to
the current Locale
</li>
</ul>
+</li>
<li>
Multi-channels
-</li>
<ul>
<li>
@@ -144,6 +143,7 @@
A mechanism similar to Java properties files is used for definition files: you
can have one definition file per key, the appropriate definition is loaded according
to the key
</li>
</ul>
+</li>
</ul>
</section>
@@ -177,7 +177,6 @@
<ul>
<li>
If you plan to use Tiles definitions defined in a centralized file, you need to
create this file and instruct Struts to load the Tiles plugin which will create the
factory corresponding to the file. You can have more than one definitions file.
-</li>
<ul>
<li>
@@ -201,6 +200,7 @@
<strong>Note:</strong> This plugin creates one factory for each Struts modules.
The plugin first reads the factory parameters from <code>web.xml</code> and then
overloads them with the ones defined in the first <code>struts-config.xml</code> file.
</li>
</ul>
+</li>
</ul>
<ul>
1.61 +1 -3 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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- struts-html.xml 19 Aug 2003 23:41:27 -0000 1.60
+++ struts-html.xml 5 Sep 2003 23:58:23 -0000 1.61
@@ -1029,12 +1029,10 @@
attribute, and "multipart/form-data" for the <code>enctype</code>
attribute. For example:
</p>
- <p>
<pre>
<html:form method="POST" enctype="multipart/form-data">
<html:file property="theFile" />
</html:form></pre>
- </p>
</info>
<attribute>
@@ -3185,8 +3183,8 @@
The set of validation rules that should be generated is based
on the formName attribute passed in, which should match
the name attribute of the form element in the xml file.
- <p>
</p>
+ <p>
The dynamicJavascript and staticJavascript attributes
default to true, but if dynamicJavascript is set to
<code>true</code>
and staticJavascript is set to <code>false</code> then only
1.20 +3 -4 jakarta-struts/doc/userGuide/struts-nested.xml
Index: struts-nested.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-nested.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- struts-nested.xml 10 Aug 2003 09:14:04 -0000 1.19
+++ struts-nested.xml 5 Sep 2003 23:58:23 -0000 1.20
@@ -91,13 +91,13 @@
but there is no logic for iterating or otherwise.
</p>
<p>
- Example...<br />
+ Example...</p>
<pre>
<nested:write property="myNestedLevel.propertyOne" />
<nested:write property="myNestedLevel.propertyTwo" />
<nested:write property="myNestedLevel.propertyThree" />
</pre>
- Can instead become...
+ <p>Can instead become...</p>
<pre>
<nested:nest property="myNestedLevel" >
<nested:write property="propertyOne" />
@@ -105,7 +105,6 @@
<nested:write property="propertyThree" />
</nested:nest >
</pre>
- </p>
</info>
<attribute>
<name>property</name>
@@ -1957,6 +1956,7 @@
to access the title and value parts of the html option tag. You can use
this in a nested context (the list is a property of a nested bean) by
using the nested define tag and the original options tag.
+ </p>
<pre>
<nested:nest property="myNestedLevel" />
<nested:define property="collectionList" />
@@ -1965,7 +1965,6 @@
valueProperty="valueProperty" />
</nested:nest >
</pre>
- </p>
</info>
<attribute>
1.16 +6 -1 jakarta-struts/doc/stylesheets/userGuide.xsl
Index: userGuide.xsl
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/stylesheets/userGuide.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- userGuide.xsl 5 Sep 2003 23:02:40 -0000 1.15
+++ userGuide.xsl 5 Sep 2003 23:58:23 -0000 1.16
@@ -372,6 +372,11 @@
</td></tr>
</xsl:template>
+ <!-- Process an tag info section -->
+ <xsl:template match="info">
+ <xsl:apply-templates/>
+ </xsl:template>
+
<!-- Process a task list section -->
<xsl:template match="task-list">
<xsl:choose>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
