You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2009/06/22 21:56:34 UTC
svn commit: r787369 - in
/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin:
./ components/trinidad/core/ components/trinidad/html/
Author: mcooper
Date: Mon Jun 22 19:56:34 2009
New Revision: 787369
URL: http://svn.apache.org/viewvc?rev=787369&view=rev
Log:
TRINIDAD-1516 Add JSR-276 design time contract metadata for the trh:tableLayout component and its children
To improve design time experience, added additional JSR-276 component contract metadata as follows:
org-apache-myfaces-trinidad-htmlhead-holder - trh:head requires one of these ancestors: [trh:html]
org-apache-myfaces-trinidad-htmlbody-holder - trh:body requires one of these ancestors: [trh:html]
org-apache-myfaces-trinidad-htmlframeborderlayout-holder - trh:frameBorderLayout requires one of these ancestors: [trh:html]
org-apache-myfaces-trinidad-htmlframe-holder - trh:frame requires one of these ancestors: [trh:frameBorderLayout]
org-apache-myfaces-trinidad-htmlrowlayout-holder - trh:rowLayout requires one of these ancestors: [trh:tableLayout]
org-apache-myfaces-trinidad-htmlcellformat-holder - trh:cellFormat requires one of these ancestors: [trh:rowLayout]
org-apache-myfaces-trinidad-corecolumn-holder - tr:column requires one of these ancestors: [tr:table, tr:treeTable, tr:column]
Added trh:frameBorderLayout as a preferred child of trh:html.
Modified:
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/Global.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrame.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHead.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHtml.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml
myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/Global.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/Global.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/Global.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/Global.xml Mon Jun 22 19:56:34 2009
@@ -11,7 +11,37 @@
<fmd:description></fmd:description>
<fmd:icon></fmd:icon>
</fmd:faces-taglib>
- </fmd:faces-taglib-definitions>
+ </fmd:faces-taglib-definitions>
+ <fmd:contract-definitions>
+ <fmd:contract id="org-apache-myfaces-trinidad-head-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Head Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlHead</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlframeborderlayout-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Frame Border Layout Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.component.html.HtmlFrameBorderLayout</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlbody-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Body Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlBody</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlframe-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Frame Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlFrame</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlrowlayout-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Row Layout Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlRowLayout</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlcellformat-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Cell Format Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlCellFormat</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-corecolumn-holder">
+ <fmd:display-name>Apache MyFaces Trinidad Core Column Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.CoreColumn</fmd:description>
+ </fmd:contract>
+ </fmd:contract-definitions>
</fmd:global-metadata>
</faces-config-extension>
</faces-config>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml Mon Jun 22 19:56:34 2009
@@ -258,6 +258,8 @@
<fmd:component-metadata>
<fmd:default-property>headerText</fmd:default-property>
<fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreOutputText</fmd:preferred-child-components>
+ <fmd:required-ancestor-contracts>org-apache-myfaces-trinidad-corecolumn-holder</fmd:required-ancestor-contracts>
+ <fmd:satisfied-contracts>org-apache-myfaces-trinidad-corecolumn-holder</fmd:satisfied-contracts>
</fmd:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml Mon Jun 22 19:56:34 2009
@@ -251,6 +251,7 @@
<fmd:component-metadata>
<fmd:default-property>id</fmd:default-property>
<fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreColumn</fmd:preferred-child-components>
+ <fmd:satisfied-contracts>org-apache-myfaces-trinidad-corecolumn-holder</fmd:satisfied-contracts>
</fmd:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml Mon Jun 22 19:56:34 2009
@@ -139,6 +139,7 @@
<fmd:component-metadata>
<fmd:default-property>id</fmd:default-property>
<fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreColumn</fmd:preferred-child-components>
+ <fmd:satisfied-contracts>org-apache-myfaces-trinidad-corecolumn-holder</fmd:satisfied-contracts>
</fmd:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml Mon Jun 22 19:56:34 2009
@@ -281,6 +281,7 @@
<mfp:uix2-local-name>body</mfp:uix2-local-name>
<fmd:component-metadata>
<fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelPage org.apache.myfaces.trinidad.CoreForm</fmd:preferred-child-components>
+ <fmd:required-ancestor-contracts>org-apache-myfaces-trinidad-htmlbody-holder</fmd:required-ancestor-contracts>
</fmd:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml Mon Jun 22 19:56:34 2009
@@ -319,6 +319,9 @@
<mfp:java-constructor>
<mfp:property-name>vAlign</mfp:property-name>
</mfp:java-constructor>
+ <fmd:component-metadata>
+ <fmd:required-ancestor-contracts>org-apache-myfaces-trinidad-htmlcellformat-holder</fmd:required-ancestor-contracts>
+ </fmd:component-metadata>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrame.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrame.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrame.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrame.xml Mon Jun 22 19:56:34 2009
@@ -214,6 +214,7 @@
<fmd:component-metadata>
<fmd:allowed-child-components>NONE</fmd:allowed-child-components>
<fmd:default-property>source</fmd:default-property>
+ <fmd:required-ancestor-contracts>org-apache-myfaces-trinidad-htmlframe-holder</fmd:required-ancestor-contracts>
</fmd:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml Mon Jun 22 19:56:34 2009
@@ -370,6 +370,8 @@
<mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
<fmd:component-metadata>
<fmd:preferred-child-components>org.apache.myfaces.trinidad.HtmlFrame</fmd:preferred-child-components>
+ <fmd:required-ancestor-contracts>org-apache-myfaces-trinidad-htmlframeborderlayout-holder</fmd:required-ancestor-contracts>
+ <fmd:satisfied-contracts>org-apache-myfaces-trinidad-htmlframe-holder</fmd:satisfied-contracts>
</fmd:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHead.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHead.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHead.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHead.xml Mon Jun 22 19:56:34 2009
@@ -83,6 +83,7 @@
<mfp:uix2-local-name>head</mfp:uix2-local-name>
<fmd:component-metadata>
<fmd:default-property>title</fmd:default-property>
+ <fmd:required-ancestor-contracts>org-apache-myfaces-trinidad-htmlhead-holder</fmd:required-ancestor-contracts>
</fmd:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHtml.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHtml.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHtml.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlHtml.xml Mon Jun 22 19:56:34 2009
@@ -62,7 +62,8 @@
<mfp:component-metadata/>
<mfp:uix2-local-name>html</mfp:uix2-local-name>
<fmd:component-metadata>
- <fmd:preferred-child-components>org.apache.myfaces.trinidad.HtmlHead org.apache.myfaces.trinidad.HtmlBody</fmd:preferred-child-components>
+ <fmd:preferred-child-components>org.apache.myfaces.trinidad.HtmlHead org.apache.myfaces.trinidad.HtmlBody org.apache.myfaces.trinidad.HtmlFrameBorderLayout</fmd:preferred-child-components>
+ <fmd:satisfied-contracts>org-apache-myfaces-trinidad-htmlhead-holder org-apache-myfaces-trinidad-htmlbody-holder org-apache-myfaces-trinidad-htmlframeborderlayout-holder</fmd:satisfied-contracts>
</fmd:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml Mon Jun 22 19:56:34 2009
@@ -268,6 +268,8 @@
</mfp:java-constructor>
<fmd:component-metadata>
<fmd:preferred-child-components>org.apache.myfaces.trinidad.HtmlCellFormat</fmd:preferred-child-components>
+ <fmd:required-ancestor-contracts>org-apache-myfaces-trinidad-htmlrowlayout-holder</fmd:required-ancestor-contracts>
+ <fmd:satisfied-contracts>org-apache-myfaces-trinidad-htmlcellformat-holder</fmd:satisfied-contracts>
</fmd:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml?rev=787369&r1=787368&r2=787369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml Mon Jun 22 19:56:34 2009
@@ -279,6 +279,7 @@
</mfp:java-constructor>
<fmd:component-metadata>
<fmd:preferred-child-components>org.apache.myfaces.trinidad.HtmlRowLayout</fmd:preferred-child-components>
+ <fmd:satisfied-contracts>org-apache-myfaces-trinidad-htmlrowlayout-holder</fmd:satisfied-contracts>
</fmd:component-metadata>
</component-extension>
</component>