myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwald...@apache.org
Subject svn commit: r780063 [4/8] - in /myfaces/trinidad/branches/1.2.11.3-branch: trinidad-build/src/main/resources/META-INF/maven-faces-plugin/ trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ trinidad-build/src/main/reso...
Date Fri, 29 May 2009 18:47:26 GMT
Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml Fri May 29 18:47:21 2009
@@ -21,8 +21,8 @@
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml"
-              xmlns:xi="http://www.w3.org/2001/XInclude">
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The outputDocument component supports styled text with line breaks.]]></description>
     <icon>
@@ -35,10 +35,11 @@
       </description>
       <facet-name>title</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:outputText</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreOutputText</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -46,10 +47,11 @@
       </description>
       <facet-name>separator</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:image tr:separator</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreImage org.apache.myfaces.trinidad.CoreSeparator</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
 
@@ -60,9 +62,10 @@
       <property-name>titleClass</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:group>${md:getTranslatedString("CORE_GROUP")}</mfp:group>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:category-id>GENERAL</fmd:category-id>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -72,9 +75,10 @@
       <property-name>separatorClass</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:group>${md:getTranslatedString("CORE_GROUP")}</mfp:group>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:category-id>GENERAL</fmd:category-id>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -99,12 +103,12 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Simon Lessard</mfp:author>
-      <mfp:component-metadata>
-        <mfp:accepts-child-components>false</mfp:accepts-child-components>
-        <mfp:favorite-property>value</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_OUTPUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>outputDocument</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:allowed-child-components>NONE</fmd:allowed-child-components>
+        <fmd:default-property>value</fmd:default-property>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputFormatted.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputFormatted.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputFormatted.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputFormatted.xml Fri May 29 18:47:21 2009
@@ -22,7 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The outputFormatted bean accepts a string in its "value" attribute
         containing a very limited set of HTML markup and outputs formatted
@@ -47,7 +47,9 @@
       <property-name>styleUsage</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:property-values>pageStamp instruction inContextBranding</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:property-values>pageStamp instruction inContextBranding</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -142,12 +144,12 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Adam Winer</mfp:author>
-      <mfp:component-metadata>
-        <mfp:accepts-child-components>false</mfp:accepts-child-components>
-        <mfp:favorite-property>value</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_OUTPUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>formattedText</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:allowed-child-components>NONE</fmd:allowed-child-components>
+        <fmd:default-property>value</fmd:default-property>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputLabel.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputLabel.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputLabel.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputLabel.xml Fri May 29 18:47:21 2009
@@ -21,8 +21,8 @@
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml"
-              xmlns:xi="http://www.w3.org/2001/XInclude">
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[Component that displays a label for a form component.]]></description>
     <icon>
@@ -60,9 +60,10 @@
       <property-class>boolean</property-class>
       <default-value>false</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:group>${md:getTranslatedString("MESSAGE_GROUP")}</mfp:group>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:category-id>APPEARANCE</fmd:category-id>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -94,10 +95,12 @@
       <property-class>java.lang.String</property-class>
       <property-extension>
         <mfp:property-metadata>
-          <mfp:group>${md:getTranslatedString("MESSAGE_GROUP")}</mfp:group>
           <mfp:short-description>${md:getTranslatedString("SD_ATTRGROUP_INLINEMESSAGINGTEXT_ATTR_FOR")}</mfp:short-description>
           <mfp:scoped-id-holder>true</mfp:scoped-id-holder>
         </mfp:property-metadata>
+        <fmd:property-metadata>
+          <fmd:category-id>APPEARANCE</fmd:category-id>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <component-extension>
@@ -123,12 +126,12 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Adam Winer</mfp:author>
-      <mfp:component-metadata>
-        <mfp:accepts-child-components>false</mfp:accepts-child-components>
-        <mfp:favorite-property>value</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_OUTPUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>messagePrompt</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:allowed-child-components>NONE</fmd:allowed-child-components>
+        <fmd:default-property>value</fmd:default-property>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputText.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputText.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputText.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputText.xml Fri May 29 18:47:21 2009
@@ -21,8 +21,8 @@
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml"
-              xmlns:xi="http://www.w3.org/2001/XInclude">
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The outputText component supports styled text.]]></description>
     <icon>
@@ -52,9 +52,11 @@
       <property-extension>
         <mfp:property-metadata>
           <mfp:translatable>true</mfp:translatable>
-          <mfp:expert>true</mfp:expert>
         </mfp:property-metadata>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:property-metadata>
+          <fmd:expert>true</fmd:expert>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -92,12 +94,12 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Blake Sullivan</mfp:author>
-      <mfp:component-metadata>
-        <mfp:accepts-child-components>false</mfp:accepts-child-components>
-        <mfp:favorite-property>value</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_OUTPUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>outputText</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:allowed-child-components>NONE</fmd:allowed-child-components>
+        <fmd:default-property>value</fmd:default-property>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml Fri May 29 18:47:21 2009
@@ -22,7 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The Page component is similar to the PanelPage component, except that instead of having navigation1, navigation2, navigation3, and navigationGlobal facets for adding navigation item information, the user binds a model object and a stamp to render these areas.]]>
     </description>
@@ -35,30 +35,33 @@
       <description><![CDATA[This location typically contains a menuChoice.]]></description>
       <facet-name>menuSwitch</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>false</mfp:preferred>
-          <mfp:preferred-children>tr:menuChoice</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred>false</fmd:preferred>
+          <fmd:preferred-child-components/>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
       <description><![CDATA[The context switcher of a page.]]></description>
       <facet-name>contextSwitcher</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:rowLayout tr:panelGroupLayout</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelGroupLayout</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
       <description><![CDATA[The node to display messages. Usually contains a messages component.]]></description>
       <facet-name>messages</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:messages</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreMessages</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -68,10 +71,11 @@
       </description>
       <facet-name>branding</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:image</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreImage</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -80,10 +84,11 @@
       </description>
       <facet-name>brandingApp</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:image</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreImage</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -104,10 +109,11 @@
       <description><![CDATA[The search region of the page.]]></description>
       <facet-name>search</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:inputText</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreInputText</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -119,9 +125,10 @@
       </description>
       <facet-name>location</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:train tr:breadCrumbs</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreTrain org.apache.myfaces.trinidad.CoreBreadCrumbs</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -133,9 +140,10 @@
       </description>
       <facet-name>actions</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:panelButtonBar tr:processChoiceBar</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelButtonBar org.apache.myfaces.trinidad.CoreProcessChoiceBar</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -144,11 +152,12 @@
       </description>
       <facet-name>appCopyright</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:outputText</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreOutputText</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -158,20 +167,22 @@
       </description>
       <facet-name>appPrivacy</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:commandLink</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandLink</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
       <description><![CDATA[Area to put a commandLink to more information about the application.]]></description>
       <facet-name>appAbout</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:commandLink</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandLink</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -181,10 +192,11 @@
       </description>
       <facet-name>infoSupplemental</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:panelBox</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelBox</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -192,10 +204,11 @@
       </description>
       <facet-name>infoReturn</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:commandLink</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandLink</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -204,10 +217,11 @@
       </description>
       <facet-name>infoUser</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelGroupLayout org.apache.myfaces.trinidad.CoreOutputFormatted</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -216,10 +230,11 @@
       </description>
       <facet-name>infoFootnote</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelGroupLayout org.apache.myfaces.trinidad.CoreOutputFormatted</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -231,9 +246,10 @@
       </description>
       <facet-name>infoStatus</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelGroupLayout org.apache.myfaces.trinidad.CoreOutputFormatted</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <property>
@@ -245,7 +261,9 @@
       <property-class>java.lang.String</property-class>
       <default-value>compact</default-value>
       <property-extension>
-        <mfp:property-values>compact expanded</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:property-values>compact expanded</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -287,9 +305,7 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Gabrielle Crawford</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>page</mfp:uix2-local-name>
       <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
     </component-extension>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml Fri May 29 18:47:21 2009
@@ -22,7 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xi="http://www.w3.org/2001/XInclude"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The panelAccordion control creates, contains and shows a series of items defined by showDetailItem nodes.]]>
     </description>
@@ -90,12 +90,12 @@
           ]]>
         </mfp:source-code>
       </mfp:example>
-      <mfp:component-metadata>
-        <mfp:favorite-property>id</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-        <mfp:preferred-children>tr:showDetailItem</mfp:preferred-children>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+      <fmd:component-metadata>
+        <fmd:default-property>id</fmd:default-property>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreShowDetailItem</fmd:preferred-child-components>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBorderLayout.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBorderLayout.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBorderLayout.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBorderLayout.xml Fri May 29 18:47:21 2009
@@ -21,7 +21,8 @@
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xi="http://www.w3.org/2001/XInclude">
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The panelBorderLayout component is a layout element which lays out all of its
           children consecutively in its middle, and supports the following
@@ -38,9 +39,10 @@
       </description>
       <facet-name>top</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -48,9 +50,10 @@
       </description>
       <facet-name>bottom</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -78,10 +81,11 @@
       </description>
       <facet-name>start</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -91,10 +95,11 @@
       </description>
       <facet-name>end</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
 
@@ -103,9 +108,10 @@
       </description>
       <facet-name>innerTop</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>false</mfp:preferred>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>false</fmd:preferred>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -113,9 +119,10 @@
       </description>
       <facet-name>innerBottom</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>false</mfp:preferred>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>false</fmd:preferred>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -141,10 +148,11 @@
       </description>
       <facet-name>innerStart</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>false</mfp:preferred>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred>false</fmd:preferred>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -152,10 +160,11 @@
       </description>
       <facet-name>innerEnd</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>false</mfp:preferred>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred>false</fmd:preferred>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
 
@@ -172,11 +181,12 @@
       <property-class>java.lang.String</property-class>
       <default-value>expand</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:property-values>expand positioned</mfp:property-values>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:property-values>expand positioned</fmd:property-values>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -188,10 +198,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -203,10 +214,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -218,10 +230,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -233,10 +246,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -249,10 +263,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -265,10 +280,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -280,10 +296,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -295,10 +312,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -311,10 +329,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -327,10 +346,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -342,10 +362,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -357,10 +378,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>25%</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -405,9 +427,7 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Adam Winer</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>borderLayout</mfp:uix2-local-name>
     </component-extension>
   </component>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml Fri May 29 18:47:21 2009
@@ -22,8 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description>
       <![CDATA[The panelBox is used to place ancillary information on a page,
@@ -43,11 +42,13 @@
       <property-name>text</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:required>false</mfp:required>
         <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
           <mfp:translatable>true</mfp:translatable>
         </mfp:property-metadata>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -59,11 +60,12 @@
       <property-class>java.lang.String</property-class>
       <default-value>light</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:property-values>light medium dark transparent</mfp:property-values>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:property-values>light medium dark transparent</fmd:property-values>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -74,11 +76,12 @@
       <property-name>icon</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:property-editor>IMAGE_URI</mfp:property-editor>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:property-editor>IMAGE_URI</fmd:property-editor>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -88,10 +91,11 @@
       <property-name>contentStyle</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <component-extension>
@@ -159,9 +163,7 @@
       </mfp:example>
       <mfp:author>Marissa Treinen</mfp:author>
       <mfp:author>Scott O'Bryan</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:java-constructor>
         <mfp:property-name>icon</mfp:property-name>
       </mfp:java-constructor>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml Fri May 29 18:47:21 2009
@@ -22,7 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The panelButtonBar lays out a set of buttons.]]></description>
     <icon>
@@ -40,7 +40,9 @@
       <property-name>halign</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:property-values>right start left end center</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:property-values>right start left end center</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -65,11 +67,12 @@
       </mfp:example>
       <mfp:author>Blake Sullivan</mfp:author>
       <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-        <mfp:preferred-children>tr:button tr:commandButton tr:resetButton tr:processChoiceBar tr:selectOneChoice</mfp:preferred-children>
         <mfp:unsupported-agents>pda</mfp:unsupported-agents>
       </mfp:component-metadata>
       <mfp:uix2-local-name>pageButtonBar</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandButton org.apache.myfaces.trinidad.CoreResetButton org.apache.myfaces.trinidad.CoreProcessChoiceBar org.apache.myfaces.trinidad.CoreSelectOneChoice</fmd:preferred-child-components>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelCaptionGroup.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelCaptionGroup.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelCaptionGroup.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelCaptionGroup.xml Fri May 29 18:47:21 2009
@@ -22,8 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description>
       <![CDATA[The panelCaptionGroup is used to render a set of components,
@@ -44,9 +43,10 @@
       </description>
       <facet-name>caption</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <property>
@@ -56,10 +56,11 @@
       <property-name>captionText</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <component-extension>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml Fri May 29 18:47:21 2009
@@ -22,7 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The panelChoice control creates, contains and shows a series of items defined by showDetailItem nodes.]]>
     </description>
@@ -35,11 +35,12 @@
       <description><![CDATA[the user-visible text of the item]]></description>
       <property-name>label</property-name>
       <property-class>java.lang.String</property-class>
+      <suggested-value>{localName} {0}</suggested-value>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:initial-value>{localName} {0}</mfp:initial-value>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -97,10 +98,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>start</default-value>
       <property-extension>
-        <mfp:property-values>top start</mfp:property-values>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:property-values>top start</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -112,10 +114,11 @@
       <property-class>java.lang.String</property-class>
       <default-value>center</default-value>
       <property-extension>
-        <mfp:property-values>top start end bottom center</mfp:property-values>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:property-values>top start end bottom center</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <component-extension>
@@ -149,12 +152,13 @@
       </mfp:example>
       <mfp:author>Ravi Baranwal</mfp:author>
       <mfp:component-metadata>
-        <mfp:favorite-property>id</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-        <mfp:preferred-children>tr:showDetailItem</mfp:preferred-children>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
       </mfp:component-metadata>
       <mfp:uix2-local-name>panelChoice</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:default-property>id</fmd:default-property>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreShowDetailItem</fmd:preferred-child-components>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml Fri May 29 18:47:21 2009
@@ -21,7 +21,8 @@
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xi="http://www.w3.org/2001/XInclude">
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The panelFormLayout lays out input form controls, such that their labels and fields line up vertically.  The children of this component are input controls, they are inputText, inputHidden, inputFile, inputColor, inputListOfValues, inputDate, selectBooleanCheckBox, selectBooleanRadio, selectOneChoice, selectOneListBox, selectOneRadio, selectManyListBox and panelLabelAndMessage.  These components must have their "simple" attribute set to false (the default).  For cases where other controls are required inside panelFormLayout, wrap them in a panelLabelAndMessage.
 
@@ -45,10 +46,11 @@
       </description>
       <facet-name>footer</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:panelButtonBar</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelButtonBar</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
 
@@ -60,10 +62,11 @@
       <property-name>fieldWidth</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -71,10 +74,11 @@
       <property-name>labelWidth</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -82,11 +86,12 @@
       <property-name>maxColumns</property-name>
       <property-class>int</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
-        <mfp:property-editor>UNSIGNED_INTEGER</mfp:property-editor>
+        <mfp:property-metadata/>
         <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:property-editor>UNSIGNED_INTEGER</fmd:property-editor>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -95,11 +100,12 @@
       <property-name>rows</property-name>
       <property-class>int</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
-        <mfp:property-editor>UNSIGNED_INTEGER</mfp:property-editor>
+        <mfp:property-metadata/>
         <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:property-editor>UNSIGNED_INTEGER</fmd:property-editor>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -108,8 +114,10 @@
       <property-name>labelAlignment</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-values>start top</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+          <fmd:property-values>start top</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -196,15 +204,11 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Gabrielle Crawford</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-        <mfp:preferred-children>tr:inputText tr:inputFile tr:selectBooleanCheckbox
-          tr:selectBooleanRadio tr:inputColor tr:inputDate
-          tr:inputListOfValues tr:selectManyListbox tr:selectOneChoice
-          tr:selectOneRadio tr:panelLabelAndMessage tr:selectManyCheckbox
-        </mfp:preferred-children>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>messageComponentLayout</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreInputText org.apache.myfaces.trinidad.CoreInputFile org.apache.myfaces.trinidad.CoreSelectBooleanCheckbox org.apache.myfaces.trinidad.CoreSelectBooleanRadio org.apache.myfaces.trinidad.CoreInputColor org.apache.myfaces.trinidad.CoreInputDate org.apache.myfaces.trinidad.CoreInputListOfValues org.apache.myfaces.trinidad.CoreSelectManyListbox org.apache.myfaces.trinidad.CoreSelectOneChoice org.apache.myfaces.trinidad.CoreSelectOneRadio org.apache.myfaces.trinidad.CorePanelLabelAndMessage org.apache.myfaces.trinidad.CoreSelectManyCheckbox</fmd:preferred-child-components>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml Fri May 29 18:47:21 2009
@@ -21,7 +21,8 @@
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xi="http://www.w3.org/2001/XInclude">
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[A panel component that displays its children in a group.]]></description>
     <icon>
@@ -45,8 +46,10 @@
       <property-class>java.lang.String</property-class>
       <default-value>default</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-values>horizontal default vertical</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+          <fmd:property-values>horizontal default vertical</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -80,9 +83,7 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Jeanne Waldman</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:java-constructor>
         <mfp:facet-name>separator</mfp:facet-name>
       </mfp:java-constructor>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml Fri May 29 18:47:21 2009
@@ -22,8 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description>
       <![CDATA[The panelHeader control places a label and optional icon at the top of a section.]]>
@@ -92,14 +91,14 @@
       </mfp:example>
       <mfp:author>Adam Winer</mfp:author>
       <mfp:author>Scott O'Bryan</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>text</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:java-constructor>
         <mfp:property-name>icon</mfp:property-name>
       </mfp:java-constructor>
       <mfp:uix2-local-name>header</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:default-property>text</fmd:default-property>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml Fri May 29 18:47:21 2009
@@ -22,7 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The panelHorizontalLayout control is a layout element that
 arranges its children horizontally. The vertical and horizontal alignment
@@ -47,7 +47,9 @@
       <property-name>valign</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:property-values>middle top baseline bottom</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:property-values>middle top baseline bottom</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -56,7 +58,9 @@
       <property-name>halign</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:property-values>right start left end center</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:property-values>right start left end center</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -89,9 +93,7 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Jeanne Waldman</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:java-constructor>
         <mfp:facet-name>separator</mfp:facet-name>
       </mfp:java-constructor>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml Fri May 29 18:47:21 2009
@@ -21,7 +21,8 @@
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xi="http://www.w3.org/2001/XInclude">
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[This component lays out a label and children.  
       Typically, the only child of this component will be an input element of some sort, 
@@ -44,9 +45,10 @@
       <description>This facet should contain field level help.</description>
       <facet-name>help</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:outputText</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreOutputText</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -63,22 +65,25 @@
       <property-class>boolean</property-class>
       <default-value>false</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:group>${md:getTranslatedString("MESSAGE_GROUP")}</mfp:group>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:category-id>APPEARANCE</fmd:category-id>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
       <description><![CDATA[the label of the bean.]]></description>
       <property-name>label</property-name>
       <property-class>java.lang.String</property-class>
+      <suggested-value>Label {0}</suggested-value>
       <property-extension>
         <mfp:property-metadata>
-          <mfp:initial-value>Label {0}</mfp:initial-value>
-          <mfp:preferred>true</mfp:preferred>
           <mfp:translatable>true</mfp:translatable>
           <mfp:short-description>${md:getTranslatedString("SD_ATTRGROUP_INLINEMESSAGINGPROMPT_ATTR_PROMPT")}</mfp:short-description>
         </mfp:property-metadata>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -119,8 +124,10 @@
           <mfp:translatable>true</mfp:translatable>
           <mfp:short-description>${md:getTranslatedString("SD_ATTRGROUP_ACCESSKEY_ATTR_VALUEANDACCESSKEY")}</mfp:short-description>
         </mfp:property-metadata>
-        <mfp:required>false</mfp:required>
         <mfp:virtual>true</mfp:virtual>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -129,11 +136,13 @@
       <property-class>java.lang.String</property-class>
       <property-extension>
         <mfp:property-metadata>
-          <mfp:group>${md:getTranslatedString("MESSAGE_GROUP")}</mfp:group>
           <mfp:short-description>${md:getTranslatedString("SD_ATTRGROUP_INLINEMESSAGINGTEXT_ATTR_FOR")}</mfp:short-description>
           <mfp:scoped-id-holder>true</mfp:scoped-id-holder>
         </mfp:property-metadata>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:category-id>APPEARANCE</fmd:category-id>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -178,11 +187,11 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Adam Winer</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>label</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>messageLayout</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:default-property>label</fmd:default-property>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelList.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelList.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelList.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelList.xml Fri May 29 18:47:21 2009
@@ -22,7 +22,7 @@
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[The panelList control outputs each visible child
           in a list with a bullet next to it.]]>
@@ -52,11 +52,12 @@
       <property-class>int</property-class>
       <default-value>2147483647</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:property-editor>UNSIGNED_INTEGER</mfp:property-editor>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:property-editor>UNSIGNED_INTEGER</fmd:property-editor>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -68,11 +69,12 @@
       <property-class>int</property-class>
       <default-value>3</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:property-editor>UNSIGNED_INTEGER</mfp:property-editor>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:property-editor>UNSIGNED_INTEGER</fmd:property-editor>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -124,12 +126,12 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Gabrielle Crawford</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>rows</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-        <mfp:preferred-children>tr:commandLink</mfp:preferred-children>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>bulletedList</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:default-property>rows</fmd:default-property>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandLink</fmd:preferred-child-components>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml Fri May 29 18:47:21 2009
@@ -21,7 +21,8 @@
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xi="http://www.w3.org/2001/XInclude">
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <component>
     <description><![CDATA[PanelPage lays out an entire page.]]></description>
     <icon>
@@ -34,10 +35,11 @@
       <description><![CDATA[Area to put a commandLink to more information about the application.]]></description>
       <facet-name>appAbout</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:commandLink</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandLink</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -46,11 +48,12 @@
       </description>
       <facet-name>appCopyright</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:outputText</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreOutputText</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -60,10 +63,11 @@
       </description>
       <facet-name>appPrivacy</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:commandLink</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandLink</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -73,10 +77,11 @@
       </description>
       <facet-name>branding</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:panelGroupLayout tr:image tr:outputText</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelGroupLayout org.apache.myfaces.trinidad.CoreImage org.apache.myfaces.trinidad.CoreOutputText</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -85,10 +90,11 @@
       </description>
       <facet-name>infoFootnote</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelGroupLayout org.apache.myfaces.trinidad.CoreOutputFormatted</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -96,10 +102,11 @@
       </description>
       <facet-name>infoReturn</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:commandLink</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandLink</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -109,9 +116,10 @@
       </description>
       <facet-name>infoStatus</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelGroupLayout org.apache.myfaces.trinidad.CoreOutputFormatted</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -120,10 +128,11 @@
       </description>
       <facet-name>infoUser</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CorePanelGroupLayout org.apache.myfaces.trinidad.CoreOutputFormatted</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
@@ -135,58 +144,64 @@
       </description>
       <facet-name>location</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:train tr:breadCrumbs</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreTrain org.apache.myfaces.trinidad.CoreBreadCrumbs</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
       <description><![CDATA[This location typically contains tabs for the primary layer.]]></description>
       <facet-name>navigation1</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:navigationPane</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreNavigationPane</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
       <description><![CDATA[This location typically contains tabs for the secondary layer.]]></description>
       <facet-name>navigation2</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:navigationPane</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreNavigationPane</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
       <description><![CDATA[An optional vertically oriented region of contexual components for the main content.  Often this contains a list or tree of links for deeper navigation structure than the global, primary, and secondary regions can provide.]]></description>
       <facet-name>navigation3</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:navigationPane tr:navigationTree</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreNavigationPane org.apache.myfaces.trinidad.CoreNavigationTree</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
       <description><![CDATA[This section typically contains global application links or otherwise top level navigation structure links, e.g. "Home", "Preferences", "Help", and "Sign Out".]]></description>
       <facet-name>navigationGlobal</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:navigationPane</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreNavigationPane</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <facet>
       <description><![CDATA[The search region of the page.  Typically used for application or system-wide searches.]]></description>
       <facet-name>search</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:inputText</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreInputText</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
 
@@ -200,7 +215,9 @@
       <property-class>int</property-class>
       <default-value>200</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -210,7 +227,9 @@
       <property-class>int</property-class>
       <default-value>200</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -220,7 +239,9 @@
       <property-class>int</property-class>
       <default-value>200</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -293,9 +314,7 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Blake Sullivan</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>pageLayout</mfp:uix2-local-name>
     </component-extension>
   </component>



Mime
View raw message