myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwald...@apache.org
Subject svn commit: r780063 [2/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/Poll.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/Poll.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/Poll.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.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 poll component initiates poll to the server.]]></description>
     <icon>
@@ -42,7 +41,7 @@
           will be executed during the Apply Request Values phase.]]>
       </description>
       <property-name>immediate</property-name>
-      <property-class>boolean</property-class>
+      <property-class>boolean</property-class>
       <default-value>false</default-value>
     </property>
     <property>
@@ -54,9 +53,10 @@
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.PollEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <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>
     <component-extension>
@@ -66,9 +66,7 @@
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXPollTag</mfp:tag-class>
       <mfp:long-description><![CDATA[The poll component initiates poll to the server.]]></mfp:long-description>
       <mfp:author>Prakash Udupa</mfp:author>
-      <mfp:component-metadata>
-        <mfp:accepts-child-components>false</mfp:accepts-child-components>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
       <mfp:event>
         <mfp:description>Event delivered at the server upon polling.</mfp:description>
@@ -76,6 +74,9 @@
         <mfp:event-delivery-phase>Apply Request Values</mfp:event-delivery-phase>
         <mfp:event-delivery-phase>Invoke Application</mfp:event-delivery-phase>
       </mfp:event>
+      <fmd:component-metadata>
+        <fmd:allowed-child-components>NONE</fmd:allowed-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/Process.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/Process.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/Process.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.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[Signifies an element that represents a process and binds to a menuModel.]]></description>
     <icon>
@@ -37,9 +36,10 @@
       </description>
       <facet-name>nodeStamp</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>tr:commandNavigationItem</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandNavigationItem</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <property>
@@ -49,9 +49,10 @@
       <property-name>value</property-name>
       <property-class>java.lang.Object</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -68,10 +69,11 @@
       <property-name>varStatus</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:literal-only>true</mfp:literal-only>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:value-expression>PROHIBITED</fmd:value-expression>
+        </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/Progress.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/Progress.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/Progress.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Progress.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[UIXProgress is a base abstraction for 
           components that implement ActionSource and 
@@ -44,9 +43,10 @@
       <property-name>value</property-name>
       <property-class>java.lang.Object</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -60,10 +60,11 @@
         <mfp:method-binding-signature>
           <mfp:return-type>java.lang.String</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>yes</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -77,10 +78,11 @@
           <mfp:parameter-type>javax.faces.event.ActionEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>yes</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -100,7 +102,7 @@
           setting immediate to true will skip validation.]]>
       </description>
       <property-name>immediate</property-name>
-      <property-class>boolean</property-class>
+      <property-class>boolean</property-class>
       <default-value>false</default-value>
     </property>
     <component-extension>
@@ -117,9 +119,7 @@
 	    delivered.]]>
       </mfp:long-description>
       <mfp:author>Prakash Udupa</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>value</mfp:favorite-property>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
       <mfp:event>
         <mfp:description>Event delivered when the task is complete. The completeness of the
@@ -130,6 +130,9 @@
         <mfp:event-delivery-phase>Any Phase</mfp:event-delivery-phase>
         <mfp:event-delivery-phase>Invoke Application</mfp:event-delivery-phase>
       </mfp:event>
+      <fmd:component-metadata>
+        <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/Reset.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/Reset.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/Reset.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Reset.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[UIXReset is a base abstraction for components that reset the state
           of a page.]]>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectBoolean.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/SelectBoolean.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/SelectBoolean.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectBoolean.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[Base class for input components whose value is true or false.]]></description>
     <icon>
@@ -41,9 +40,10 @@
       <default-value>false</default-value>
       <property-extension>
         <mfp:alias-of>value</mfp:alias-of>
-        <mfp:property-metadata>
-          <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>
     <component-extension>
@@ -52,11 +52,11 @@
       <mfp:renderer-type>org.apache.myfaces.trinidad.SelectBoolean</mfp:renderer-type>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXSelectBooleanTag</mfp:tag-class>
       <mfp:author>Brian Albers</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>label</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
+      <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/SelectInput.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/SelectInput.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/SelectInput.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.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[selectInput is a base abstraction for
           components that allow both input and selection 
@@ -42,11 +41,12 @@
         <mfp:method-binding-signature>
           <mfp:return-type>java.lang.String</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>yes</mfp:state-holder>
         <mfp:jsp-property-name>action</mfp:jsp-property-name>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -58,10 +58,11 @@
           <mfp:parameter-type>javax.faces.event.ActionEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>yes</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -73,9 +74,10 @@
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.ReturnEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <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>
     <component-extension>
@@ -88,9 +90,7 @@
           from a list of possible values.]]>
       </mfp:long-description>
       <mfp:author>Adam Winer</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
       <mfp:event>
         <mfp:description>Event delivered when the "action" of the selectInput has been

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectItem.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/SelectItem.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/SelectItem.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectItem.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 UIXSelectItem class is the base concrete class for a single
           item which the user may select from the set of items in a list,
@@ -43,9 +42,10 @@
       <property-name>value</property-name>
       <property-class>java.lang.Object</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
     <component-extension>
@@ -53,12 +53,12 @@
       <mfp:component-supertype>org.apache.myfaces.trinidad.ComponentBase</mfp:component-supertype>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXSelectItemTag</mfp:tag-class>
       <mfp:author>Andy Schwartz</mfp:author>
-      <mfp:component-metadata>
-        <mfp:accepts-child-components>false</mfp:accepts-child-components>
-        <mfp:favorite-property>itemValue</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
+      <fmd:component-metadata>
+        <fmd:allowed-child-components>NONE</fmd:allowed-child-components>
+        <fmd:default-property>itemValue</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/SelectMany.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/SelectMany.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/SelectMany.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectMany.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[UIXSelectMany is a base abstraction for 
           components that allow selection of multiple of a
@@ -49,11 +48,11 @@
     &lt;tr:selectItem&gt; components.]]>
       </mfp:long-description>
       <mfp:author>Adam Winer</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
-        <mfp:preferred-children>tr:selectItem</mfp:preferred-children>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
+      <fmd:component-metadata>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreSelectItem</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/SelectOne.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/SelectOne.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/SelectOne.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectOne.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[UIXSelectOne is a base abstraction for 
           components that allow selection of a single in a
@@ -48,14 +47,14 @@
           represents an available option that the user may select.]]>
       </mfp:long-description>
       <mfp:author>Adam Winer</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
-        <mfp:preferred-children>tr:selectItem</mfp:preferred-children>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:java-constructor>
         <mfp:property-name>localName</mfp:property-name>
       </mfp:java-constructor>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
+      <fmd:component-metadata>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreSelectItem</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/SelectOrder.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/SelectOrder.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/SelectOrder.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectOrder.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[UIXSelectOrder is a base abstraction for 
           components that allow selection of multiple of a
@@ -41,14 +40,14 @@
       <mfp:renderer-type>org.apache.myfaces.trinidad.Shuttle</mfp:renderer-type>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXSelectOrderTag</mfp:tag-class>
       <mfp:author>Adam Winer</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
-        <mfp:preferred-children>tr:selectItem</mfp:preferred-children>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:java-constructor>
         <mfp:property-name>localName</mfp:property-name>
       </mfp:java-constructor>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
+      <fmd:component-metadata>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreSelectItem</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/SelectRange.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/SelectRange.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/SelectRange.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.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[UIXSelectRange is a base abstraction for 
           components that select a
@@ -38,9 +37,10 @@
       <description><![CDATA[use to customize the label of each range selection.]]></description>
       <facet-name>rangeLabel</facet-name>
       <facet-extension>
-        <mfp:facet-metadata>
-          <mfp:preferred-children>f:selectItem tr:selectItem</mfp:preferred-children>
-        </mfp:facet-metadata>
+        <mfp:facet-metadata/>
+        <fmd:facet-metadata>
+          <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreSelectItem</fmd:preferred-child-components>
+        </fmd:facet-metadata>
       </facet-extension>
     </facet>
     <property>
@@ -52,10 +52,11 @@
       <property-name>var</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:literal-only>true</mfp:literal-only>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:value-expression>PROHIBITED</fmd:value-expression>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -69,7 +70,7 @@
           will be executed during the Apply Request Values phase.]]>
       </description>
       <property-name>immediate</property-name>
-      <property-class>boolean</property-class>
+      <property-class>boolean</property-class>
       <default-value>false</default-value>
     </property>
     <property>
@@ -83,9 +84,10 @@
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.RangeChangeEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <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>
@@ -102,9 +104,10 @@
       <property-name>value</property-name>
       <property-class>java.lang.Object</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -118,9 +121,10 @@
       <property-class>int</property-class>
       <default-value>25</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <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>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.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/ShowDetail.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/ShowDetail.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.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[showDetail is a base component abstraction for components
           that can toggle between showing and hiding all of their
@@ -40,10 +39,11 @@
       <property-class>boolean</property-class>
       <default-value>false</default-value>
       <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>
@@ -55,10 +55,11 @@
       <property-class>boolean</property-class>
       <default-value>false</default-value>
       <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>
@@ -72,7 +73,7 @@
           event will be executed during the Apply Request Values phase.]]>
       </description>
       <property-name>immediate</property-name>
-      <property-class>boolean</property-class>
+      <property-class>boolean</property-class>
       <default-value>false</default-value>
     </property>
     <property>
@@ -84,9 +85,10 @@
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.DisclosureEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <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>
     <component-extension>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowMany.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/ShowMany.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/ShowMany.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowMany.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[showMany is the base abstraction for components that contain
 a group of showDetails and can display multiple items at a time.]]>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowOne.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/ShowOne.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/ShowOne.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowOne.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[showOne is the base abstraction for components that contains
 a group of showDetails, but displays one of them.]]>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SingleStep.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/SingleStep.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/SingleStep.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SingleStep.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[UIXSingleStep is a base abstraction for components
           that implement ActionSource and 
@@ -42,9 +41,10 @@
       <default-value>1</default-value>
       <property-extension>
         <mfp:alternate-class>long</mfp:alternate-class>
-        <mfp:property-metadata>
-          <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>
@@ -61,9 +61,10 @@
       <default-value>-1</default-value>
       <property-extension>
         <mfp:alternate-class>long</mfp:alternate-class>
-        <mfp:property-metadata>
-          <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>
@@ -78,10 +79,11 @@
           <mfp:parameter-type>javax.faces.event.ActionEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>yes</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -96,10 +98,11 @@
           <mfp:parameter-type>javax.faces.event.ActionEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>yes</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -113,10 +116,11 @@
         <mfp:method-binding-signature>
           <mfp:return-type>java.lang.String</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>yes</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -130,10 +134,11 @@
         <mfp:method-binding-signature>
           <mfp:return-type>java.lang.String</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>yes</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <component-extension>
@@ -174,10 +179,7 @@
           </section>]]>
       </mfp:long-description>
       <mfp:author>Jeanne Waldman</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>selectedStep</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_NAVIGATION")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
       <mfp:event>
         <mfp:description>Event delivered when the "action" of the component has been
@@ -188,6 +190,9 @@
         <mfp:event-delivery-phase>Invoke Application</mfp:event-delivery-phase>
         <mfp:event-delivery-phase>Apply Request Values</mfp:event-delivery-phase>
       </mfp:event>
+      <fmd:component-metadata>
+        <fmd:default-property>selectedStep</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/Subform.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/Subform.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/Subform.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Subform.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>
     <icon>
       <!-- small-icon>/org/apache/myfaces/trinidadinternal/metadata/icons/baseSubform.png</small-icon -->
@@ -36,9 +35,11 @@
       <property-class>boolean</property-class>
       <default-value>false</default-value>
       <property-extension>
-        <mfp:literal-only>true</mfp:literal-only>
         <mfp:tag-attribute-excluded>true</mfp:tag-attribute-excluded>
         <mfp:transient>yes</mfp:transient>
+        <fmd:property-metadata>
+          <fmd:value-expression>PROHIBITED</fmd:value-expression>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -50,7 +51,9 @@
       <property-class>boolean</property-class>
       <default-value>false</default-value>
       <property-extension>
-        <mfp:literal-only>true</mfp:literal-only>
+        <fmd:property-metadata>
+          <fmd:value-expression>PROHIBITED</fmd:value-expression>
+        </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/Switcher.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/Switcher.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/Switcher.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Switcher.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 switcher component dynamically decides which facet component
 should be rendered.]]></description>
@@ -37,9 +36,10 @@
       <property-name>facetName</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/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -82,10 +82,10 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Adam Winer</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>childName</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_OTHER")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
+      <fmd:component-metadata>
+        <fmd:default-property>childName</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/Table.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/Table.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/Table.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.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[UIXTable is the base abstraction for table components.]]></description>
     <icon>
@@ -55,9 +54,10 @@
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.SortEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <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>
@@ -71,9 +71,10 @@
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.RangeChangeEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <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>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.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/Tree.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/Tree.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.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[Represents an interactive tree component.]]></description>
     <icon>
@@ -60,10 +59,11 @@
       <property-name>varStatus</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:literal-only>true</mfp:literal-only>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:value-expression>PROHIBITED</fmd:value-expression>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -72,9 +72,10 @@
       <property-name>value</property-name>
       <property-class>java.lang.Object</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -85,9 +86,10 @@
       <property-name>focusRowKey</property-name>
       <property-class>java.lang.Object</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -99,9 +101,10 @@
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.FocusEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <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>
@@ -114,9 +117,10 @@
       <property-class>boolean</property-class>
       <default-value>false</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
 

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.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/TreeTable.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/TreeTable.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.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 Apache Trinidad TreeTable is used to display data that is structured in a hierarchical format.]]>
     </description>
@@ -42,10 +41,11 @@
       <property-class>boolean</property-class>
       <default-value>true</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
-        <mfp:required>false</mfp:required>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -64,9 +64,10 @@
       <property-name>rowsByDepth</property-name>
       <property-class>int[]</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -80,9 +81,10 @@
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.RangeChangeEvent</mfp:parameter-type>
           <mfp:return-type>void</mfp:return-type>
         </mfp:method-binding-signature>
-        <mfp:property-metadata>
-          <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>
     <component-extension>
@@ -112,13 +114,13 @@
         </html:p>]]>
       </mfp:long-description>
       <mfp:author>Arjuna Wijeyekoon</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>id</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_DATA")}</mfp:group>
-        <mfp:preferred-children>tr:column</mfp:preferred-children>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:tag-class-modifier>abstract</mfp:tag-class-modifier>
       <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
+      <fmd:component-metadata>
+        <fmd:default-property>id</fmd:default-property>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreColumn</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/Value.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/Value.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/Value.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Value.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 UIXValue component contains all the shared attributes
    supported by all Apache Trinidad components that support the JSF
@@ -42,9 +41,10 @@
       <property-name>value</property-name>
       <property-class>java.lang.Object</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -52,10 +52,11 @@
       <property-name>converter</property-name>
       <property-class>javax.faces.convert.Converter</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:group>${md:getTranslatedString("CORE_GROUP")}</mfp:group>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>yes</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:category-id>GENERAL</fmd:category-id>
+        </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/CoreBreadCrumbs.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/CoreBreadCrumbs.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/CoreBreadCrumbs.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreBreadCrumbs.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 breadCrumbs component is used in hierarchical
           site layouts to indicate the path back to the root page of the
@@ -43,7 +44,9 @@
       <property-class>java.lang.String</property-class>
       <default-value>horizontal</default-value>
       <property-extension>
-        <mfp:property-values>horizontal vertical</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:property-values>horizontal vertical</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -93,11 +96,11 @@
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Blake Sullivan</mfp:author>
-      <mfp:component-metadata>
-        <mfp:group>${md:getTranslatedString("PALETTE_NAVIGATION")}</mfp:group>
-        <mfp:preferred-children>tr:commandNavigationItem</mfp:preferred-children>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>breadCrumbs</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreCommandNavigationItem</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/CoreChart.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/CoreChart.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/CoreChart.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml Fri May 29 18:47:21 2009
@@ -20,7 +20,7 @@
 -->
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" 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 Trinidad Chart is used to diplay data in a chart format.]]>
     </description>
@@ -36,10 +36,10 @@
       <property-class>java.lang.String</property-class>
       <default-value>verticalBar</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-values>
-          verticalBar horizontalBar stackedVerticalBar stackedHorizontalBar pie area stackedArea line barLine XYLine scatterPlot radar radarArea funnel circularGauge semiCircularGauge
-      </mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+          <fmd:property-values>verticalBar horizontalBar stackedVerticalBar stackedHorizontalBar pie area stackedArea line barLine XYLine scatterPlot radar radarArea funnel circularGauge semiCircularGauge</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -55,7 +55,9 @@
       <property-name>templateSource</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -65,7 +67,9 @@
       <property-class>boolean</property-class>
       <default-value>true</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -75,10 +79,10 @@
       <property-class>java.lang.String</property-class>
       <default-value>bottom</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-values>
-          none bottom end top start
-        </mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+          <fmd:property-values>none bottom end top start</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -88,7 +92,9 @@
       <property-class>int</property-class>
       <default-value>1000</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -99,7 +105,9 @@
       <property-class>int</property-class>
       <default-value>3</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -110,7 +118,9 @@
       <property-class>int</property-class>
       <default-value>-1</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -123,7 +133,9 @@
       <property-class>int</property-class>
       <default-value>-1</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -133,7 +145,9 @@
       <property-class>int</property-class>
       <default-value>0</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -143,7 +157,9 @@
       <property-class>boolean</property-class>
       <default-value>true</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -152,7 +168,9 @@
       <property-class>boolean</property-class>
       <default-value>true</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <component-extension>
@@ -174,10 +192,11 @@
       </mfp:example>
       <mfp:author>Venkata Guddanti</mfp:author>
       <mfp:component-metadata>
-        <mfp:favorite-property>id</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_DATA")}</mfp:group>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
       </mfp:component-metadata>
+      <fmd:component-metadata>
+        <fmd:default-property>id</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/CoreChooseColor.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/CoreChooseColor.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/CoreChooseColor.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.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 chooseColor control creates a palette for picking colors.]]></description>
     <icon>
@@ -35,9 +35,10 @@
       <property-name>colorData</property-name>
       <property-class><![CDATA[java.util.List<java.awt.Color>]]></property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -45,9 +46,10 @@
       <property-name>customColorData</property-name>
       <property-class><![CDATA[java.util.List<java.awt.Color>]]></property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -55,9 +57,10 @@
       <property-name>width</property-name>
       <property-class>int</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
 
@@ -137,11 +140,12 @@
       </mfp:example>
       <mfp:author>John Fallows</mfp:author>
       <mfp:component-metadata>
-        <mfp:accepts-child-components>false</mfp:accepts-child-components>
-        <mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
       </mfp:component-metadata>
       <mfp:uix2-local-name>colorPalette</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:allowed-child-components>NONE</fmd:allowed-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/CoreChooseDate.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/CoreChooseDate.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/CoreChooseDate.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.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 chooseDate component is used in conjunction with a
           selectInputDate to allow the user to quickly select a date value without
@@ -45,9 +45,10 @@
       <property-name>minValue</property-name>
       <property-class>java.util.Date</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <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>
@@ -64,9 +65,11 @@
       <property-class>java.util.Date</property-class>
       <property-extension>
         <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
           <mfp:use-max-time>true</mfp:use-max-time>
         </mfp:property-metadata>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -116,11 +119,12 @@
       </mfp:example>
       <mfp:author>Blake Sullivan</mfp:author>
       <mfp:component-metadata>
-        <mfp:accepts-child-components>false</mfp:accepts-child-components>
-        <mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
         <mfp:unsupported-agents>pda phone</mfp:unsupported-agents>
       </mfp:component-metadata>
       <mfp:uix2-local-name>inlineDatePicker</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:allowed-child-components>NONE</fmd:allowed-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/CoreColumn.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/CoreColumn.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/CoreColumn.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.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[Component that is used as a child of the Table component. The Column
 component defines the header, footer and data for a single column in the
@@ -43,8 +43,10 @@
       <property-class>java.lang.String</property-class>
       <default-value>start</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-values>start end center left right</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+          <fmd:property-values>start end center left right</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -55,8 +57,10 @@
       <property-class>java.lang.String</property-class>
       <default-value>ascending</default-value>
       <property-extension>
-        <mfp:required>false</mfp:required>
-        <mfp:property-values>ascending descending</mfp:property-values>
+        <fmd:property-metadata>
+          <fmd:required>false</fmd:required>
+          <fmd:property-values>ascending descending</fmd:property-values>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -249,12 +253,12 @@
           </section>]]>
       </mfp:long-description>
       <mfp:author>Brian Albers</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>headerText</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_DATA")}</mfp:group>
-        <mfp:preferred-children>tr:outputText</mfp:preferred-children>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>column</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:default-property>headerText</fmd:default-property>
+        <fmd:preferred-child-components>org.apache.myfaces.trinidad.CoreOutputText</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/CoreCommandButton.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/CoreCommandButton.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/CoreCommandButton.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreCommandButton.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 commandButton control creates a button representation of a UIXCommand.]]></description>
     <icon>
@@ -34,12 +34,14 @@
       <description><![CDATA[the textual label of the button.]]></description>
       <property-name>text</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:translatable>true</mfp:translatable>
         </mfp:property-metadata>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -104,10 +106,11 @@
       <property-class>boolean</property-class>
       <default-value>false</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>no</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -127,9 +130,11 @@
       <property-class>java.lang.String</property-class>
       <property-extension>
         <mfp:property-metadata>
-          <mfp:property-editor>IMAGE_URI</mfp:property-editor>
           <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
         </mfp:property-metadata>
+        <fmd:property-metadata>
+          <fmd:property-editor>IMAGE_URI</fmd:property-editor>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -171,12 +176,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>text</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_NAVIGATION")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>button</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:allowed-child-components>NONE</fmd:allowed-child-components>
+        <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/CoreCommandLink.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/CoreCommandLink.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/CoreCommandLink.xml (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreCommandLink.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 commandLink control creates a link representation of a UIXCommand.]]></description>
     <icon>
@@ -34,12 +34,14 @@
       <description><![CDATA[the textual label of the link.]]></description>
       <property-name>text</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:translatable>true</mfp:translatable>
         </mfp:property-metadata>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -104,10 +106,11 @@
       <property-class>boolean</property-class>
       <default-value>false</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
         <mfp:state-holder>no</mfp:state-holder>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 
@@ -139,11 +142,11 @@
         <mfp:source-code>&lt;tr:commandLink text="Return to Portal"/&gt;</mfp:source-code>
       </mfp:example>
       <mfp:author>Andy Schwartz</mfp:author>
-      <mfp:component-metadata>
-        <mfp:favorite-property>text</mfp:favorite-property>
-        <mfp:group>${md:getTranslatedString("PALETTE_NAVIGATION")}</mfp:group>
-      </mfp:component-metadata>
+      <mfp:component-metadata/>
       <mfp:uix2-local-name>link</mfp:uix2-local-name>
+      <fmd:component-metadata>
+        <fmd:default-property>text</fmd:default-property>
+      </fmd:component-metadata>
     </component-extension>
   </component>
 </faces-config>



Mime
View raw message