You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2006/11/25 19:48:57 UTC

svn commit: r479162 [2/2] - in /myfaces: core/branches/jsf12/api/src/main/java-templates/javax/faces/component/ core/branches/jsf12/api/src/main/java/javax/faces/component/ core/branches/jsf12/api/src/main/java/javax/faces/component/html/ core/branches...

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/_UniversalProperties.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/_UniversalProperties.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/_UniversalProperties.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/_UniversalProperties.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,47 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+    <component>
+        <!-- dir, lang, style, styleClass -->
+        <property>
+            <description>The direction of text display, either 'ltr' (left-to-right) or 'rtl' (right-to-left).</description>
+            <property-name>dir</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+        <property>
+            <description>The base language of this document.</description>
+            <property-name>lang</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+        <property>
+            <description>CSS styling instructions.</description>
+            <property-name>style</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+        <property>
+            <description>The CSS class for this element. Corresponds to the HTML 'class' attribute.</description>
+            <property-name>styleClass</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+        <property>
+            <description>An advisory title for this element. Often used by the user agent as a tooltip.
+            </description>
+            <property-name>title</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+    </component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/accesskey.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/accesskey.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/accesskey.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/accesskey.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,13 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+    <component>
+        <property>
+            <description>Sets the access key for this element.</description>
+            <property-name>accesskey</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+    </component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/hreflang.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/hreflang.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/hreflang.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/html/hreflang.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,13 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+    <component>
+        <property>
+            <description>The language code for teh link.</description>
+            <property-name>hreflang</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+    </component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesBindingProperty.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesBindingProperty.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesBindingProperty.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesBindingProperty.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,16 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+    <component>
+        <property>
+            <description>Identifies a backing bean property (of type UIComponent or appropriate
+                subclass) to bind to this component instance. This value must be an
+                EL expression.
+            </description>
+            <property-name>binding</property-name>
+            <property-class>javax.el.ValueExpression</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+    </component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesIdOptionalProperty.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesIdOptionalProperty.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesIdOptionalProperty.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesIdOptionalProperty.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,17 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+		xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+		xmlns:xi="http://www.w3.org/2001/XInclude">
+	<component>
+		<property>
+			<description> The developer-assigned ID of this component.  The ID must be unique
+			within the scope of the tag's enclosing naming container (e.g. 
+			h:form or f:subview).  This value must be a static value.</description>
+			<property-name>id</property-name>
+			<property-class>java.lang.String</property-class>
+			<property-extension>
+                <mfp:literal-only>true</mfp:literal-only>
+                <mfp:required>false</mfp:required>
+			</property-extension>
+		</property>
+	</component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesRenderedProperty.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesRenderedProperty.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesRenderedProperty.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/FacesRenderedProperty.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,19 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+		xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+		xmlns:xi="http://www.w3.org/2001/XInclude">
+	<component>
+        <property>
+            <description>A boolean value that indicates whether this component should be rendered.
+			Default value: true.</description>
+            <property-name>rendered</property-name>
+            <property-class>boolean</property-class>
+            <default-value>true</default-value>
+            <property-extension>
+                <mfp:property-metadata>
+                    <!-- todo: is this general???-->
+                    <mfp:group>${md:getTranslatedString("CORE_GROUP")}</mfp:group>
+                </mfp:property-metadata>
+            </property-extension>
+        </property>
+	</component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_CommandProperties.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_CommandProperties.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_CommandProperties.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_CommandProperties.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,71 @@
+<!-- UICommand attributes -->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <component>
+        <!--value, actionListener, action, immediate-->
+        <property>
+            <description><![CDATA[The initial value of this component.]]></description>
+            <property-name>value</property-name>
+            <property-class>java.lang.Object</property-class>
+        </property>
+
+        <property>
+            <description><![CDATA[Specifies the action to take when this command is invoked.
+        If the value is an expression, it is expected to be a method
+        binding EL expression that identifies an action method. An action method
+        accepts no parameters and has a String return value, called the action
+        outcome, that identifies the next view displayed. The phase that this
+        event is fired in can be controlled via the immediate attribute.
+
+    	If the value is a string literal, it is treated as a navigation outcome
+    	for the current view.  This is functionally equivalent to a reference to
+    	an action method that returns the string literal.]]></description>
+            <property-name>actionExpression</property-name>
+            <property-class>javax.el.MethodExpression</property-class>
+            <property-extension>
+                <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:state-holder>yes</mfp:state-holder>
+                <mfp:jsp-property-name>action</mfp:jsp-property-name>
+            </property-extension>
+        </property>
+
+        <property>
+            <description><![CDATA[A method binding EL expression that identifies an action listener method
+        to be invoked if this component is activated by the user. An action
+        listener method accepts a parameter of type javax.faces.event.ActionEvent
+        and returns void. The phase that this event is fired in can be controlled
+        via the immediate attribute.]]></description>
+            <property-name>actionListener</property-name>
+            <property-class>javax.faces.el.MethodBinding</property-class>
+            <property-extension>
+                <mfp:method-binding-signature>
+                    <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:required>false</mfp:required>
+                </mfp:property-metadata>
+                <mfp:state-holder>yes</mfp:state-holder>
+            </property-extension>
+        </property>
+
+        <property>
+            <description><![CDATA[A boolean value that identifies the phase during which action events
+        should fire. During normal event processing, action methods and
+        action listener methods are fired during the "invoke application"
+        phase of request processing. If this attribute is set to "true",
+        these methods are fired instead at the end of the "apply request
+        values" phase.]]></description>
+            <property-name>immediate</property-name>
+            <property-class>boolean</property-class>
+        </property>
+
+    </component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_ComponentProperties.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_ComponentProperties.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_ComponentProperties.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_ComponentProperties.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,11 @@
+<!-- UIComponent attributes -->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+		xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+		xmlns:xi="http://www.w3.org/2001/XInclude">
+	<component>
+        <!-- UIComponent attributes -->
+        <xi:include href="FacesIdOptionalProperty.xml" xpointer="/faces_config/component/*" />
+		<xi:include href="FacesBindingProperty.xml" xpointer="/faces_config/component/*" />
+	    <xi:include href="FacesRenderedProperty.xml" xpointer="/faces_config/component/*" />
+	</component>
+</faces-config>	
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_DataProperties.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_DataProperties.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_DataProperties.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_DataProperties.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,46 @@
+<!-- UICommand attributes -->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <component>
+        <!--value, var, rows, first-->
+        <property>
+			<description>An EL expression that specifies the data model that backs this table.  The value can be of any type.
+
+				A value of type DataModel is used directly.  Array-like parameters of type java.util.List, array of Object,
+				java.sql.ResultSet, or javax.servlet.jsp.jstl.sql.Result are wrapped in a DataModel.
+
+				Other values are wrapped in a DataModel as a single row.</description>
+			<property-name>value</property-name>
+            <property-class>java.lang.Object</property-class>
+            <property-extension>
+				<mfp:required>false</mfp:required>
+			</property-extension>
+		</property>
+		<property>
+			<description>Defines the name of the request-scope variable that will hold the current row during iteration.  This value must be a static value.</description>
+			<property-name>var</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+				<mfp:required>true</mfp:required>
+			</property-extension>
+		</property>
+		<property>
+			<description>The number of rows to be displayed.  Specify zero for all remaining rows in the table.</description>
+			<property-name>rows</property-name>
+            <property-class>int</property-class>
+            <property-extension>
+				<mfp:required>false</mfp:required>
+			</property-extension>
+		</property>
+		<property>
+			<description>The index of the first row to be displayed, where 0 is the first row.</description>
+			<property-name>first</property-name>
+            <property-class>int</property-class>
+            <property-extension>
+				<mfp:required>false</mfp:required>
+			</property-extension>
+		</property>
+
+    </component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_TableRendererProperties.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_TableRendererProperties.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_TableRendererProperties.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/includes/ui/_TableRendererProperties.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,70 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <component>
+        <!-- columnClasses, footerClass, headerClass, rowClasses, captionClass, captionStyle -->
+        <property>
+            <description>A comma separated list of CSS class names to apply to td elements in
+                each column. More than one class can be applied to a column by separing the classes
+                with a space. I there are less classes than the number of columns, apply the same
+                sequence of classes to the remaining columns. If there are more classes specified
+                than the number of columns, ignore the last classes
+            </description>
+            <property-name>columnClasses</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+        <property>
+            <description>The CSS class to be applied to footer cells.</description>
+            <property-name>footerClass</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+        <property>
+            <description>The CSS class to be applied to header cells.</description>
+            <property-name>headerClass</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+        <property>
+            <description>A comma separated list of CSS class names to apply to td elements in
+                each row. If tere are less classes than the number of rows, apply the same
+                sequence of classes to the remaining rows, so the pattern is repeated.
+                More than one class can be applied to a row by separing the classes
+                with a space.
+            </description>
+            <property-name>rowClasses</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+        <property>
+            <description>A comma separated list of CSS class names to apply to all captions.
+                If tere are less classes than the number of rows, apply the same
+                sequence of classes to the remaining captions, so the pattern is repeated.
+                More than one class can be applied to a row by separing the classes
+                with a space.
+            </description>
+            <property-name>captionClass</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+        <property>
+            <description>The CSS class to be applied to the Caption.</description>
+            <property-name>captionStyle</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+    </component>
+</faces-config>
\ No newline at end of file

Modified: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml (original)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml Sat Nov 25 10:48:54 2006
@@ -15,51 +15,23 @@
   limitations under the License.
 -->
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:f="http://java.sun.com/jsf/core"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <component>
-    <component-type>javax.faces.Component</component-type>
-    <component-class>javax.faces.component.UIComponent</component-class>
-    <property>
-      <description>the identifier for the component
-      </description>
-      <property-name>id</property-name>
-      <property-class>java.lang.String</property-class>
-      <property-extension>
-        <mfp:literal-only>true</mfp:literal-only>
-      </property-extension>
-    </property>
-    <property>
-      <description>whether the bean is rendered. When set to false, no output
-                   will be delivered for this bean.
-      </description>
-      <property-name>rendered</property-name>
-      <property-class>boolean</property-class>
-      <default-value>true</default-value>
-      <property-extension>
-        <mfp:property-metadata>
-	  <mfp:group>${md:getTranslatedString("CORE_GROUP")}</mfp:group>
-	</mfp:property-metadata>
-      </property-extension>
-    </property>
-    <property>
-      <description>a binding reference to store the component instance
-      </description>
-      <property-name>binding</property-name>
-      <property-class>javax.el.ValueExpression</property-class>
-    </property>
-    <property>
-      <property-name>transient</property-name>
-      <property-class>boolean</property-class>
-      <property-extension>
-        <mfp:literal-only>true</mfp:literal-only>
-        <mfp:transient>true</mfp:transient>
-        <mfp:tag-attribute-excluded>true</mfp:tag-attribute-excluded>
-        <mfp:property-metadata>
-    	  <mfp:group>${md:getTranslatedString("CORE_GROUP")}</mfp:group>
-	</mfp:property-metadata>
-      </property-extension>
-    </property>
-  </component>
-</faces-config>
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <component>
+        <component-type>javax.faces.Component</component-type>
+        <component-class>javax.faces.component.UIComponent</component-class>
+
+        <!-- id, binding, rendered-->
+        <xi:include href="../../includes/ui/_ComponentProperties.xml" xpointer="/faces-config/component/*"/>
+        
+        <property>
+            <property-name>transient</property-name>
+            <property-class>boolean</property-class>
+            <property-extension>
+                <mfp:literal-only>true</mfp:literal-only>
+                <mfp:transient>true</mfp:transient>
+                <mfp:tag-attribute-excluded>true</mfp:tag-attribute-excluded>
+            </property-extension>
+        </property>
+    </component>
+</faces-config>
\ No newline at end of file

Modified: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml (original)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml Sat Nov 25 10:48:54 2006
@@ -18,12 +18,12 @@
               xmlns:f="http://java.sun.com/jsf/core"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <component>
-    <component-type>javax.faces.ComponentBase</component-type>
-    <component-class>javax.faces.component.UIComponentBase</component-class>
-    <component-extension>
-      <mfp:component-supertype>javax.faces.Component</mfp:component-supertype>
-      <mfp:tag-class>javax.faces.webapp.UIComponentELTag</mfp:tag-class>
-    </component-extension>
-  </component>
+    <component>
+        <component-type>javax.faces.ComponentBase</component-type>
+        <component-class>javax.faces.component.UIComponentBase</component-class>
+        <component-extension>
+            <mfp:component-supertype>javax.faces.Component</mfp:component-supertype>
+            <mfp:tag-class>javax.faces.webapp.UIComponentELTag</mfp:tag-class>
+        </component-extension>
+    </component>
 </faces-config>

Modified: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UICommand.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UICommand.xml?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UICommand.xml (original)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UICommand.xml Sat Nov 25 10:48:54 2006
@@ -18,80 +18,35 @@
               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">
-  <component>
-    <description><![CDATA[UICommand is a base abstraction for
-          components that implement ActionSource.]]>
-    </description>
-    <component-type>javax.faces.Command</component-type>
-    <component-class>javax.faces.component.UICommand</component-class>
-      <property>
-      <description><![CDATA[value of the component. Usually this is the label]]>
-      </description>
-      <property-name>value</property-name>
-      <property-class>java.lang.Object</property-class>
-    </property>
-    <property>
-      <description><![CDATA[a reference to an action method sent by the command component,
-              or the static outcome of an action]]>
-      </description>
-      <property-name>actionExpression</property-name>
-      <property-class>javax.el.MethodExpression</property-class>
-      <property-extension>
-        <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:state-holder>yes</mfp:state-holder>
-        <mfp:jsp-property-name>action</mfp:jsp-property-name>
-      </property-extension>
-    </property>
-    <property>
-      <description><![CDATA[a method reference to an action listener]]></description>
-      <property-name>actionListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
-      <property-extension>
-        <mfp:method-binding-signature>
-          <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:state-holder>yes</mfp:state-holder>
-      </property-extension>
-    </property>
-    <property>
-      <description><![CDATA[whether or not data validation - client-side or
-            server-side -
-          should take place when
-          events are generated by this component.
+    <component>
+        <!-- ################################ defined Properties ################################ -->
+        <!-- # from super classes:                                                              # -->
+        <!-- #     id, binding, rendered, transient                                             # -->
+        <!-- # ******************************************************************************** # -->
+        <!-- # value, action, actionListener, immediate                                         # -->
+        <!-- #################################################################################### -->
+        <component-type>javax.faces.Command</component-type>
+        <component-class>javax.faces.component.UICommand</component-class>
+        <description>UICommand is a base abstraction for components that implement ActionSource.</description>
 
-          When immediate is true, the default ActionListener
-          provided by the JavaServer Faces implementation
-          should be executed during Apply Request Values phase
-          of the request processing lifecycle, rather than
-          waiting until the Invoke Application phase.]]>
-      </description>
-      <property-name>immediate</property-name>
-      <property-class>boolean</property-class>
-    </property>
-    <component-extension>
-      <mfp:component-family>javax.faces.Command</mfp:component-family>
-      <mfp:component-supertype>javax.faces.ComponentBase</mfp:component-supertype>
-      <mfp:renderer-type>javax.faces.Button</mfp:renderer-type>
-      <mfp:tag-superclass>javax.faces.webapp.UIComponentELTag</mfp:tag-superclass>
-      <mfp:event>
-        <mfp:description>Event delivered when the "action" of the component has been
-invoked;  for example, by clicking on a button.  The action may result
-in page navigation.
-        </mfp:description>
-        <mfp:event-type>javax.faces.Action</mfp:event-type>
-        <mfp:event-delivery-phase>Invoke Application</mfp:event-delivery-phase>
-        <mfp:event-delivery-phase>Apply Request Values</mfp:event-delivery-phase>
-      </mfp:event>
-    </component-extension>
-  </component>
+        <!-- value, action, actionListener, immediate-->
+        <xi:include href="../../includes/ui/_CommandProperties.xml" xpointer="/faces-config/component/*"/>
+        
+        <component-extension>
+            <mfp:component-family>javax.faces.Command</mfp:component-family>
+            <mfp:component-supertype>javax.faces.ComponentBase</mfp:component-supertype>
+            <mfp:renderer-type>javax.faces.Button</mfp:renderer-type>
+
+            <mfp:event>
+                <mfp:description>Event delivered when the "action" of the component has been
+                    invoked; for example, by clicking on a button. The action may result
+                    in page navigation.
+                </mfp:description>
+                <mfp:event-type>javax.faces.Action</mfp:event-type>
+                <mfp:event-delivery-phase>Invoke Application</mfp:event-delivery-phase>
+                <mfp:event-delivery-phase>Apply Request Values</mfp:event-delivery-phase>
+            </mfp:event>
+        </component-extension>
+    </component>
 </faces-config>
 

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIData.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIData.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIData.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIData.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              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">
+    <component>
+        <description><![CDATA[UIData is a base abstraction for components that holds Data.]]></description>
+        <component-type>javax.faces.Data</component-type>
+        <component-class>javax.faces.component.UIData</component-class>
+
+        <!--value, var, rows, first-->
+        <xi:include href="../../includes/ui/_DataProperties.xml" xpointer="/faces-config/component/*"/>
+
+        <component-extension>
+            <mfp:component-family>javax.faces.Data</mfp:component-family>
+            <mfp:component-supertype>javax.faces.ComponentBase</mfp:component-supertype>
+        </component-extension>
+    </component>
+</faces-config>
+

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIForm.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIForm.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIForm.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIForm.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              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">
+    <component>
+        <!-- ################################ defined Properties ################################ -->
+        <!-- # from super classes:                                                              # -->
+        <!-- #     id, binding, rendered, transient                                             # -->
+        <!-- #################################################################################### -->
+        <component-type>javax.faces.Form</component-type>
+        <component-class>javax.faces.component.UIForm</component-class>
+        <description></description>
+
+        <component-extension>
+            <mfp:component-supertype>javax.faces.ComponentBase</mfp:component-supertype>
+            <mfp:renderer-type>javax.faces.Form</mfp:renderer-type>
+        </component-extension>
+    </component>
+
+</faces-config>
+

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIGrapic.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIGrapic.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIGrapic.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIGrapic.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              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">
+    <component>
+        <!-- ################################ defined Properties ################################ -->
+        <!-- # from super classes:                                                              # -->
+        <!-- #     id, binding, rendered, transient                                             # -->
+        <!-- # ******************************************************************************** # -->
+        <!-- # value, url                                                                       # -->
+        <!-- #################################################################################### -->
+        <component-type>javax.faces.Graphic</component-type>
+        <component-class>javax.faces.component.UIGraphic</component-class>
+        <description>Displays a graphical image.</description>
+
+        <property>
+            <description>The value property of the UIGraphic</description>
+            <property-name>value</property-name>
+            <property-class>java.lang.Object</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+
+        <property>
+            <description>The image URL</description>
+            <property-name>url</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+
+        <component-extension>
+            <mfp:component-family>javax.faces.Graphic</mfp:component-family>
+            <mfp:component-supertype>javax.faces.ComponentBase</mfp:component-supertype>
+            <mfp:renderer-type>javax.faces.Image</mfp:renderer-type>
+        </component-extension>
+    </component>
+
+</faces-config>
+

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIOutput.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIOutput.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIOutput.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/UIOutput.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              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">
+    <component>
+        <!-- ################################ defined Properties ################################ -->
+        <!-- # from super classes:                                                              # -->
+        <!-- #     id, binding, rendered, transient                                             # -->
+        <!-- # ******************************************************************************** # -->
+        <!-- # value, converter                                                                 # -->
+        <!-- #################################################################################### -->
+        <component-type>javax.faces.Output</component-type>
+        <component-class>javax.faces.component.UIOutput</component-class>
+        <description>UICommand is a base abstraction for components that implement ActionSource.</description>
+
+        <property>
+            <description>The initial value of this component.</description>
+            <property-name>value</property-name>
+            <property-class>java.lang.Object</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+			</property-extension>
+        </property>
+
+        <property>
+            <description>An Instance ot the Converter</description>
+            <property-name>converter</property-name>
+            <property-class>javax.faces.convert.Converter</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+			</property-extension>
+        </property>
+
+        <component-extension>
+            <mfp:component-family>javax.faces.Output</mfp:component-family>
+            <mfp:component-supertype>javax.faces.ComponentBase</mfp:component-supertype>
+            <mfp:renderer-type>javax.faces.Text</mfp:renderer-type>
+        </component-extension>
+    </component>
+</faces-config>
+

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlCommandButton.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlCommandButton.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlCommandButton.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlCommandButton.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,67 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:h="http://java.sun.com/jsf/html"
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <component>
+        <description>
+            This tag renders as an HTML input element.
+
+            Unless otherwise specified, all attributes accept static values
+            or EL expressions.
+        </description>
+
+        <!-- SPEC PAGE 299-300 column 1-->
+        <component-type>javax.faces.HtmlCommandButton</component-type>
+        <component-class>javax.faces.component.html.HtmlCommandButton</component-class>
+
+        <!-- inherited from superclasses: -->
+        <!--   'id' is declared in javax.faces.webapp.UIComponentClassicTagBase -->
+        <!--   'binding' and 'rendered' are declared in javax.faces.webapp.UIComponentELTag -->
+        <!--   'value', 'action', 'actionListener' and 'immediate' are declared in the Tag-superclass (see below)-->
+
+        <xi:include href="../../../includes/html/accesskey.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/AltProperty.xml" xpointer="/faces-config/component/*"/>
+
+        <!-- dir, lang, style, styleClass, title -->
+        <xi:include href="../../../includes/html/_UniversalProperties.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/DisabledProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/ImageProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/LabelProperty.xml" xpointer="/faces-config/component/*"/>
+
+        <!-- onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout,
+            onkeypress, onkeydown, onkeyup-->
+        <xi:include href="../../../includes/html/_EventHandlerProperties.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/OnchangeProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/OnselectProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/Focus_BlurProperties.xml" xpointer="/faces-config/component/*"/>
+
+        <xi:include href="../../../includes/html/ReadonlyProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/TabindexProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/TypeProperty.xml" xpointer="/faces-config/component/*"/>
+
+        <property>
+            <description>The initial width of this control.</description>
+            <property-name>size</property-name>
+            <property-class>java.lang.String</property-class>
+            <property-extension>
+                <mfp:required>false</mfp:required>
+            </property-extension>
+        </property>
+
+        <component-extension>
+            <!--for the Component generation-->
+            <mfp:component-family>javax.faces.Command</mfp:component-family>
+            <mfp:component-supertype>javax.faces.Command</mfp:component-supertype>
+
+            <!--for the TLD generation-->
+            <!-- SPEC PAGE 299-300 column 3-->
+            <mfp:tag-name>h:commandButton</mfp:tag-name>
+
+            <!--for the TagLib generation-->
+            <mfp:tag-class>org.apache.myfaces.taglib.html.HtmlCommandButtonTag</mfp:tag-class>
+
+            <!-- SPEC PAGE 299-300 column 2-->
+            <mfp:renderer-type>javax.faces.Button</mfp:renderer-type>
+        </component-extension>
+    </component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlCommandLink.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlCommandLink.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlCommandLink.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlCommandLink.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,61 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:h="http://java.sun.com/jsf/html"
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <component>
+        <description>
+            This tag renders as an HTML a element.
+
+            Unless otherwise specified, all attributes accept static values
+            or EL expressions.
+        </description>
+
+        <!-- SPEC PAGE 299-300 column 1-->
+        <component-type>javax.faces.HtmlCommandLink</component-type>
+        <component-class>javax.faces.component.html.HtmlCommandLink</component-class>
+
+        <!-- inherited from superclasses: -->
+        <!--   'id' is declared in javax.faces.webapp.UIComponentClassicTagBase -->
+        <!--   'binding' and 'rendered' are declared in javax.faces.webapp.UIComponentELTag -->
+        <!--   'value', 'action', 'actionListener' and 'immediate' are declared in the Tag-superclass (see below)-->
+
+        <xi:include href="../../../includes/html/accesskey.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/CharsetProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/CoordsProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/hreflang.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/DisabledProperty.xml" xpointer="/faces-config/component/*"/>
+
+        <!-- dir, lang, style, styleClass, title -->
+        <xi:include href="../../../includes/html/_UniversalProperties.xml" xpointer="/faces-config/component/*"/>
+
+        <!-- onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout,
+            onkeypress, onkeydown, onkeyup-->
+        <xi:include href="../../../includes/html/_EventHandlerProperties.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/Focus_BlurProperties.xml" xpointer="/faces-config/component/*"/>
+
+        <xi:include href="../../../includes/html/RelProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/RevProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/ShapeProperty.xml" xpointer="/faces-config/component/*"/>
+
+        <xi:include href="../../../includes/html/TargetProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/TabindexProperty.xml" xpointer="/faces-config/component/*"/>
+        <xi:include href="../../../includes/html/TypeProperty.xml" xpointer="/faces-config/component/*"/>
+
+        <component-extension>
+            <!--for the Component generation-->
+            <mfp:component-family>javax.faces.Command</mfp:component-family>
+            <mfp:component-superclass>javax.faces.component.UICommand</mfp:component-superclass>
+            <mfp:component-supertype>javax.faces.Command</mfp:component-supertype>
+
+            <!--for the TLD generation-->
+            <!-- SPEC PAGE 299-300 column 3-->
+            <mfp:tag-name>h:commandLink</mfp:tag-name>
+
+            <!--for the TagLib generation-->
+            <mfp:tag-class>org.apache.myfaces.taglib.html.HtmlCommandLinkTag</mfp:tag-class>
+
+            <!-- SPEC PAGE 299-300 column 2-->
+            <mfp:renderer-type>javax.faces.Link</mfp:renderer-type>
+        </component-extension>
+    </component>
+</faces-config>
\ No newline at end of file

Added: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlDataTable.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlDataTable.xml?view=auto&rev=479162
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlDataTable.xml (added)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlDataTable.xml Sat Nov 25 10:48:54 2006
@@ -0,0 +1,53 @@
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:h="http://java.sun.com/jsf/html"
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <component>
+        <description>
+            This component renders as an HTML table element.  It has as its
+            children h:column entities, which describe the columns of the table.
+            It can be decorated with facets named "header" and "footer" to
+            specify header and footer rows.
+
+            Unless otherwise specified, all attributes accept static values
+            or EL expressions.
+        </description>
+
+        <!-- SPEC PAGE 299-300 column 1-->
+        <component-type>javax.faces.HtmlDataTable</component-type>
+        <component-class>javax.faces.component.html.HtmlDataTable</component-class>
+
+        <!-- inherited from superclasses: -->
+        <!--   'id' is declared in javax.faces.webapp.UIComponentClassicTagBase -->
+        <!--   'binding' and 'rendered' are declared in javax.faces.webapp.UIComponentELTag -->
+
+        <!-- columnClasses, footerClass, headerClass, rowClasses, captionClass, captionStyle -->
+        <xi:include href="../../../includes/ui/_TableRendererProperties.xml" xpointer="/faces_config/component/*" />
+
+        <!-- dir, lang, style, styleClass -->
+        <xi:include href="../../../includes/html/_UniversalProperties.xml" xpointer="/faces_config/component/*" />
+
+         <!-- onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup-->
+        <xi:include href="../../../includes/html/_EventHandlerProperties.xml" xpointer="/faces_config/component/*" />
+
+        <!-- align, border, bgcolor, datafld, datasrc, dataformatas, cellpadding, cellspacing, frame, rules, summary, width-->
+        <xi:include href="../../../includes/html/_TableProperties.xml" xpointer="/faces_config/component/*" />
+
+        <component-extension>
+            <!--for the Component generation-->
+            <mfp:component-family>javax.faces.Data</mfp:component-family>
+            <mfp:component-superclass>javax.faces.component.UIData</mfp:component-superclass>
+            <mfp:component-supertype>javax.faces.Data</mfp:component-supertype>
+
+            <!--for the TLD generation-->
+            <!-- SPEC PAGE 299-300 column 3-->
+            <mfp:tag-name>h:dataTable</mfp:tag-name>
+
+            <!--for the TagLib generation-->
+            <mfp:tag-class>org.apache.myfaces.taglib.html.HtmlDataTableTag</mfp:tag-class>
+
+            <!-- SPEC PAGE 299-300 column 2-->
+            <mfp:renderer-type>javax.faces.Table</mfp:renderer-type>
+        </component-extension>
+    </component>
+</faces-config>
\ No newline at end of file

Modified: myfaces/core/branches/jsf12/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/pom.xml?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/core/branches/jsf12/impl/pom.xml (original)
+++ myfaces/core/branches/jsf12/impl/pom.xml Sat Nov 25 10:48:54 2006
@@ -26,7 +26,7 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
+      <!--<plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.1.2</version>
         <configuration>
@@ -49,7 +49,7 @@
           <srcDir>src/main/tld</srcDir>
           <destDir>target/classes/META-INF</destDir>
         </configuration>
-      </plugin>
+      </plugin>-->
       <plugin>
         <groupId>org.apache.myfaces.trinidadbuild</groupId>
         <artifactId>maven-faces-plugin</artifactId>
@@ -60,8 +60,8 @@
         <version>baranda-2.0-SNAPSHOT</version>
         <configuration>
           <taglibs>
-            <tr>http://myfaces.apache.org/trinidad</tr>
-            <trh>http://myfaces.apache.org/trinidad/html</trh>
+            <f>http://java.sun.com/jsf/core</f>
+            <h>http://java.sun.com/jsf/html</h>
           </taglibs>
           <!--
           <faceletHandlerClass>org.apache.myfaces.trinidadinternal.facelets.TrinidadComponentHandler</faceletHandlerClass>

Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java Sat Nov 25 10:48:54 2006
@@ -25,9 +25,9 @@
 
     public ImplClassElementTestCase(){
         
-        resource.add("META-INF/myfaces_html.tld");
-        resource.add("META-INF/myfaces_core.tld");
-        resource.add("org/apache/myfaces/resource/standard-faces-config.xml");
+        //resource.add("META-INF/f.tld");
+        resource.add("META-INF/h.tld");
+        resource.add("META-INF/faces-config.xml");
         
     }
     

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java Sat Nov 25 10:48:54 2006
@@ -19,7 +19,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import javax.faces.FacesException;
-import javax.faces.component.UIOutput;
 import javax.faces.component.UISelectMany;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Sat Nov 25 10:48:54 2006
@@ -18,7 +18,6 @@
 import java.io.IOException;
 
 import javax.faces.component.UIComponent;
-import javax.faces.component.UIGraphic;
 import javax.faces.component.html.HtmlGraphicImage;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Sat Nov 25 10:48:54 2006
@@ -26,7 +26,6 @@
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UICommand;
 import javax.faces.component.UIComponent;
-import javax.faces.component.UIOutput;
 import javax.faces.component.UIParameter;
 import javax.faces.component.html.HtmlCommandLink;
 import javax.faces.context.FacesContext;

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java Sat Nov 25 10:48:54 2006
@@ -23,7 +23,6 @@
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
-import javax.faces.component.UIOutput;
 import javax.faces.component.UISelectOne;
 import javax.faces.component.html.HtmlSelectOneRadio;
 import javax.faces.context.FacesContext;

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Sat Nov 25 10:48:54 2006
@@ -29,7 +29,6 @@
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
-import javax.faces.component.UIOutput;
 import javax.faces.component.UISelectBoolean;
 import javax.faces.component.UISelectMany;
 import javax.faces.component.UISelectOne;

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java Sat Nov 25 10:48:54 2006
@@ -23,7 +23,6 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
-import javax.faces.component.UIOutput;
 import javax.faces.component.html.HtmlInputSecret;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java Sat Nov 25 10:48:54 2006
@@ -23,7 +23,6 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
-import javax.faces.component.UIOutput;
 import javax.faces.component.UIViewRoot;
 import javax.faces.component.html.HtmlInputText;
 import javax.faces.component.html.HtmlOutputText;

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java Sat Nov 25 10:48:54 2006
@@ -22,7 +22,6 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
-import javax.faces.component.UIOutput;
 import javax.faces.component.html.HtmlInputTextarea;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java?view=diff&rev=479162&r1=479161&r2=479162
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java Sat Nov 25 10:48:54 2006
@@ -25,7 +25,6 @@
 import javax.faces.component.EditableValueHolder;
 import javax.faces.component.UICommand;
 import javax.faces.component.UIComponent;
-import javax.faces.component.UIGraphic;
 import javax.faces.component.UIParameter;
 import javax.faces.component.UISelectBoolean;
 import javax.faces.component.ValueHolder;