You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2005/12/02 00:04:15 UTC
svn commit: r351512 - in /myfaces/impl/trunk/tld: ./ entities/
Author: skitching
Date: Thu Dec 1 15:04:07 2005
New Revision: 351512
URL: http://svn.apache.org/viewcvs?rev=351512&view=rev
Log:
Separate out duplicate definitions for id, binding and rendered
attributes into a single common definition.
Added:
myfaces/impl/trunk/tld/entities/faces_binding_attribute.xml (with props)
myfaces/impl/trunk/tld/entities/faces_id_optional_attribute.xml (with props)
myfaces/impl/trunk/tld/entities/faces_id_required_attribute.xml (with props)
myfaces/impl/trunk/tld/entities/faces_rendered_attribute.xml (with props)
Modified:
myfaces/impl/trunk/tld/entities/ui_component_attributes.xml
myfaces/impl/trunk/tld/entities/ui_parameter_attributes.xml
myfaces/impl/trunk/tld/entities/ui_select_item_attributes.xml
myfaces/impl/trunk/tld/entities/ui_select_items_attributes.xml
myfaces/impl/trunk/tld/myfaces_core.tld
myfaces/impl/trunk/tld/myfaces_html.tld
Added: myfaces/impl/trunk/tld/entities/faces_binding_attribute.xml
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/entities/faces_binding_attribute.xml?rev=351512&view=auto
==============================================================================
--- myfaces/impl/trunk/tld/entities/faces_binding_attribute.xml (added)
+++ myfaces/impl/trunk/tld/entities/faces_binding_attribute.xml Thu Dec 1 15:04:07 2005
@@ -0,0 +1,11 @@
+<attribute>
+ <name>binding</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+ <description>
+ Identifies a backing bean property (of type UIComponent or appropriate
+ subclass) to bind to this component instance. This value must be an
+ EL expression.
+ </description>
+</attribute>
Propchange: myfaces/impl/trunk/tld/entities/faces_binding_attribute.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/impl/trunk/tld/entities/faces_binding_attribute.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/impl/trunk/tld/entities/faces_id_optional_attribute.xml
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/entities/faces_id_optional_attribute.xml?rev=351512&view=auto
==============================================================================
--- myfaces/impl/trunk/tld/entities/faces_id_optional_attribute.xml (added)
+++ myfaces/impl/trunk/tld/entities/faces_id_optional_attribute.xml Thu Dec 1 15:04:07 2005
@@ -0,0 +1,11 @@
+<attribute>
+ <name>id</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+ <description>
+ The developer-assigned ID of this component. The ID must be unique
+ within the scope of the tag's enclosing naming container (e.g.
+ h:form or f:subview). This value must be a static value.
+ </description>
+</attribute>
Propchange: myfaces/impl/trunk/tld/entities/faces_id_optional_attribute.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/impl/trunk/tld/entities/faces_id_optional_attribute.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/impl/trunk/tld/entities/faces_id_required_attribute.xml
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/entities/faces_id_required_attribute.xml?rev=351512&view=auto
==============================================================================
--- myfaces/impl/trunk/tld/entities/faces_id_required_attribute.xml (added)
+++ myfaces/impl/trunk/tld/entities/faces_id_required_attribute.xml Thu Dec 1 15:04:07 2005
@@ -0,0 +1,11 @@
+<attribute>
+ <name>id</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+ <description>
+ The developer-assigned ID of this component. The ID must be unique
+ within the scope of the tag's enclosing naming container (e.g.
+ h:form or f:subview). This value must be a static value.
+ </description>
+</attribute>
Propchange: myfaces/impl/trunk/tld/entities/faces_id_required_attribute.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/impl/trunk/tld/entities/faces_id_required_attribute.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/impl/trunk/tld/entities/faces_rendered_attribute.xml
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/entities/faces_rendered_attribute.xml?rev=351512&view=auto
==============================================================================
--- myfaces/impl/trunk/tld/entities/faces_rendered_attribute.xml (added)
+++ myfaces/impl/trunk/tld/entities/faces_rendered_attribute.xml Thu Dec 1 15:04:07 2005
@@ -0,0 +1,10 @@
+<attribute>
+ <name>rendered</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+ <description>
+ A boolean value that indicates whether this component should be rendered.
+ Default value: true.
+ </description>
+</attribute>
Propchange: myfaces/impl/trunk/tld/entities/faces_rendered_attribute.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/impl/trunk/tld/entities/faces_rendered_attribute.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/impl/trunk/tld/entities/ui_component_attributes.xml
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/entities/ui_component_attributes.xml?rev=351512&r1=351511&r2=351512&view=diff
==============================================================================
--- myfaces/impl/trunk/tld/entities/ui_component_attributes.xml (original)
+++ myfaces/impl/trunk/tld/entities/ui_component_attributes.xml Thu Dec 1 15:04:07 2005
@@ -1,25 +1,4 @@
<!-- UIComponent attributes -->
- <attribute>
- <name>id</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>The developer-assigned ID of this component. The ID must be unique within the scope of the tag's
- enclosing naming container (e.g. h:form or f:subview). This value must be a static value.
- </description>
- </attribute>
- <attribute>
- <name>rendered</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>A boolean value that indicates whether this component should be rendered.</description>
- </attribute>
- <attribute>
- <name>binding</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>Identifies a backing bean property, of type UIComponent,
- to bind to this component instance. This value must be a static value.</description>
- </attribute>
+&faces_id_optional_attribute;
+&faces_binding_attribute;
+&faces_rendered_attribute;
Modified: myfaces/impl/trunk/tld/entities/ui_parameter_attributes.xml
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/entities/ui_parameter_attributes.xml?rev=351512&r1=351511&r2=351512&view=diff
==============================================================================
--- myfaces/impl/trunk/tld/entities/ui_parameter_attributes.xml (original)
+++ myfaces/impl/trunk/tld/entities/ui_parameter_attributes.xml Thu Dec 1 15:04:07 2005
@@ -1,24 +1,7 @@
<!-- UIParameter attributes -->
-<attribute>
- <name>binding</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>An EL value binding that identifies a backing bean property, of type UIComponent,
- to bind to this component instance.</description>
-</attribute>
-<attribute>
- <name>id</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>
- Developer-assigned ID of this component. The ID must be unique within the scope of the tag's
- enclosing naming container (e.g. h:form or f:subview).
-
- This must be a static value.
- </description>
-</attribute>
+&faces_binding_attribute;
+&faces_id_optional_attribute;
+
<attribute>
<name>name</name>
<required>false</required>
Modified: myfaces/impl/trunk/tld/entities/ui_select_item_attributes.xml
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/entities/ui_select_item_attributes.xml?rev=351512&r1=351511&r2=351512&view=diff
==============================================================================
--- myfaces/impl/trunk/tld/entities/ui_select_item_attributes.xml (original)
+++ myfaces/impl/trunk/tld/entities/ui_select_item_attributes.xml Thu Dec 1 15:04:07 2005
@@ -1,30 +1,13 @@
<!-- UISelectItem attributes -->
- <attribute>
- <name>binding</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>A value that identifies a backing bean property, of type UIComponent,
- to bind to this component instance.</description>
- </attribute>
+&faces_binding_attribute;
+&faces_id_optional_attribute;
+
<attribute>
<name>itemDisabled</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<type>java.lang.String</type>
<description>If true, this component will not be saved during state saving.</description>
- </attribute>
- <attribute>
- <name>id</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>
- A Developer-assigned ID of this component. The ID must be unique within the scope of the tag's
- enclosing naming container (e.g. h:form or f:subview).
-
- This must be a static value.
- </description>
</attribute>
<attribute>
<name>itemDescription</name>
Modified: myfaces/impl/trunk/tld/entities/ui_select_items_attributes.xml
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/entities/ui_select_items_attributes.xml?rev=351512&r1=351511&r2=351512&view=diff
==============================================================================
--- myfaces/impl/trunk/tld/entities/ui_select_items_attributes.xml (original)
+++ myfaces/impl/trunk/tld/entities/ui_select_items_attributes.xml Thu Dec 1 15:04:07 2005
@@ -1,35 +1,24 @@
<!-- UISelectItems attributes -->
- <attribute>
- <name>binding</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>A value that identifies a backing bean property, of type UIComponent,
- to bind to this component instance. </description>
- </attribute>
- <attribute>
- <name>id</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>
- A Developer-assigned ID of this component. The ID must be unique within the scope of the tag's
- enclosing naming container (e.g. h:form or f:subview).
-
- This must be a static value.
- </description>
- </attribute>
- <attribute>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>An EL expression that specifies the contents of the selection list. The expression can refer to one of the following:
-
- 1. a single SelectItem
- 2. an array or Collection of SelectItem instances
- 3. a Map. The contents of the Map are used to create SelectItem instances, where the SelectItem's label is the map's key value,
- and the SelectItem's value is the map's value.
-
- The value properties of each of the SelectItems must be of the same basic type as the parent component's value.</description>
- </attribute>
+&faces_binding_attribute;
+&faces_id_optional_attribute;
+
+<attribute>
+ <name>value</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+ <description><![CDATA[
+ An EL expression that specifies the contents of the selection list.
+ The expression can refer to one of the following:
+ <ol>
+ <li>A single SelectItem</li>
+ <li>An array or Collection of SelectItem instances</li>
+ <li>A Map. The contents of the Map are used to create SelectItem
+ instances, where the SelectItem's label is the map's key value,
+ and the SelectItem's value is the map's value.</li>
+ </ol>
+ The value properties of each of the SelectItems must be of the same
+ basic type as the parent component's value.
+ ]]>
+ </description>
+</attribute>
Modified: myfaces/impl/trunk/tld/myfaces_core.tld
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/myfaces_core.tld?rev=351512&r1=351511&r2=351512&view=diff
==============================================================================
--- myfaces/impl/trunk/tld/myfaces_core.tld (original)
+++ myfaces/impl/trunk/tld/myfaces_core.tld Thu Dec 1 15:04:07 2005
@@ -20,6 +20,10 @@
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd" [
<!ENTITY validator_min_max_attributes SYSTEM "entities/validator_min_max_attributes.xml">
+<!ENTITY faces_binding_attribute SYSTEM "entities/faces_binding_attribute.xml">
+<!ENTITY faces_id_optional_attribute SYSTEM "entities/faces_id_optional_attribute.xml">
+<!ENTITY faces_id_required_attribute SYSTEM "entities/faces_id_required_attribute.xml">
+<!ENTITY faces_rendered_attribute SYSTEM "entities/faces_rendered_attribute.xml">
<!ENTITY ui_component_attributes SYSTEM "entities/ui_component_attributes.xml">
<!ENTITY ui_parameter_attributes SYSTEM "entities/ui_parameter_attributes.xml">
<!ENTITY ui_select_item_attributes SYSTEM "entities/ui_select_item_attributes.xml">
@@ -390,35 +394,9 @@
Unless otherwise specified, all attributes accept static values or EL expressions.
</description>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>
- The developer-assigned ID of this component. The ID must be
- unique within the scope of the tag's enclosing naming container
- (e.g., h:form or f:subview). This value must be a static value.
- </description>
- </attribute>
- <attribute>
- <name>rendered</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>
- A boolean value that indicates whether this component should be
- rendered. Default: true.
- </description>
- </attribute>
- <attribute>
- <name>binding</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>Identifies a backing bean property, of type UIComponent,
- to bind to this component instance. This value must be a static value.</description>
- </attribute>
+ &faces_id_required_attribute;
+ &faces_binding_attribute;
+ &faces_rendered_attribute;
</tag>
<!--
Modified: myfaces/impl/trunk/tld/myfaces_html.tld
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/myfaces_html.tld?rev=351512&r1=351511&r2=351512&view=diff
==============================================================================
--- myfaces/impl/trunk/tld/myfaces_html.tld (original)
+++ myfaces/impl/trunk/tld/myfaces_html.tld Thu Dec 1 15:04:07 2005
@@ -19,6 +19,12 @@
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd" [
+
+<!ENTITY faces_binding_attribute SYSTEM "entities/faces_binding_attribute.xml">
+<!ENTITY faces_id_optional_attribute SYSTEM "entities/faces_id_optional_attribute.xml">
+<!ENTITY faces_id_required_attribute SYSTEM "entities/faces_id_required_attribute.xml">
+<!ENTITY faces_rendered_attribute SYSTEM "entities/faces_rendered_attribute.xml">
+
<!ENTITY html_anchor_attributes SYSTEM "entities/html_anchor_attributes.xml">
<!ENTITY html_button_attributes SYSTEM "entities/html_button_attributes.xml">
<!ENTITY html_event_handler_attributes SYSTEM "entities/html_event_handler_attributes.xml">