Author: vkorluzhenko Date: 2007-12-21 07:35:01 -0500 (Fri, 21 Dec 2007) New Revision: 4946 Removed: branches/3.1.x/docs/userguide/build.xml branches/3.1.x/docs/userguide/f.xsl Modified: branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml branches/3.1.x/ui/core/src/main/config/component/form.xml branches/3.1.x/ui/dataTable/src/main/config/component/dataGrid.xml branches/3.1.x/ui/dataTable/src/main/config/component/dataTable.xml branches/3.1.x/ui/dataTable/src/main/config/component/subTable.xml branches/3.1.x/ui/datascroller/src/main/config/component/datascroller.xml branches/3.1.x/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml branches/3.1.x/ui/jQuery/src/main/config/component/jQuery.xml branches/3.1.x/ui/panelmenu/src/main/config/component/panelMenu.xml branches/3.1.x/ui/tooltip/src/main/config/component/toolTip.xml Log: http://jira.jboss.com/jira/browse/RF-971 - Branch and trunk merge Deleted: branches/3.1.x/docs/userguide/build.xml =================================================================== --- branches/3.1.x/docs/userguide/build.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/docs/userguide/build.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -1,20 +0,0 @@ -<project name="Documentation" default="all.doc" basedir="."> - - <!-- Set the following property to generate the doco in the output folder --> - <property name="build.dir" value="${basedir}/../target/"/> - - <property name="pdf.name" value="richfaces-usersguide.pdf" /> - <import file="../resources/support.xml" /> - - <target name="all.doc" depends="clean"> - <antcall target="lang.all"><param name="lang" value="en"/></antcall> - </target> - - <!-- Use this alternate target to enable uptodate checking, i.e. - don't generate docs if nothing has changed - <target name="all.doc"> - <antcall target="lang.all.run"><param name="lang" value="en"/></antcall> - </target> - --> - -</project> Deleted: branches/3.1.x/docs/userguide/f.xsl =================================================================== --- branches/3.1.x/docs/userguide/f.xsl 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/docs/userguide/f.xsl 2007-12-21 12:35:01 UTC (rev 4946) @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:javaee="http://java.sun.com/JSP/TagLibraryDescriptor" - version="1.0" exclude-result-prefixes="javaee"> - <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/> - <xsl:param name="lang" /> - <xsl:param name="title" /> - <xsl:param name="separator" /> - - <xsl:template match="javaee:taglib | taglib"> - <xsl:variable name="excluded-tag-names">header2,header3,header4,header5,header6</xsl:variable> - - <xsl:for-each select="javaee:tag | tag"> - - <!--xsl:value-of select="./name/text()" /--> - - <xsl:if test="not(contains($excluded-tag-names, javaee:name))"> - <xsl:call-template name="tag" /> - </xsl:if> - <xsl:if test="not(contains($excluded-tag-names, ./name/text()))"> - <xsl:call-template name="tag" /> - </xsl:if> - </xsl:for-each> - </xsl:template> - - <xsl:template name="tag"> - <section role="NotInToc"> - <xsl:variable name="tag_name"> - <xsl:choose> - <xsl:when test="javaee:name"> - <xsl:value-of select="javaee:name" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="./name/text()" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable name="prefix"> - <xsl:choose> - <xsl:when test="/javaee:taglib/javaee:short-name"> - <xsl:value-of select="/javaee:taglib/javaee:short-name" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="/taglib/short-name/text()" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:attribute name="id"><xsl:value-of select="$tag_name"/></xsl:attribute> - <title>&lt;<xsl:value-of select="concat($prefix,':', $tag_name)" />&gt;</title> - <xsl:for-each select="document(concat($lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/*"> - <xsl:copy-of select="./*"/> - </xsl:for-each> - <table> - <title><xsl:value-of select="$prefix"/>:<xsl:value-of select="javaee:name"/><xsl:value-of select="name"/> attributes</title> - <tgroup cols="2"> - <thead> - <row> - <entry>Attribute Name</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <xsl:for-each select="javaee:attribute | attribute"> - <row> - <entry> - <xsl:value-of select="javaee:name"/> - <xsl:value-of select="name"/> - </entry> - <entry> - <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> - <xsl:value-of select="description" disable-output-escaping="yes"/> - </entry> - </row> - </xsl:for-each> - </tbody> - </tgroup> - </table> - <xsl:for-each select="document(concat($lang, $separator,'included',$separator,$tag_name, '.xml'))/*"> - <xsl:copy-of select="./*"/> - </xsl:for-each> - </section> - </xsl:template> -</xsl:transform> \ No newline at end of file Modified: branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml =================================================================== --- branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -158,7 +158,7 @@ <classname>java.lang.Object</classname> <description> List of the day names displays on the days bar in the - following way &quot;Sun, Mon, Tue, Wed, …&quot; + following way &quot;Sun, Mon, Tue, Wed, &quot; </description> </property> <property> @@ -201,9 +201,9 @@ <classname>java.lang.String</classname> <description> Used for the dates boundaries in the list. Valid values - are &quot;inactive&quot; (Default) – dates inactive and - gray colored, &quot;scroll&quot; – boundaries work as - month scrolling controls, and &quot;select&quot; – + are &quot;inactive&quot; (Default) dates inactive and + gray colored, &quot;scroll&quot; boundaries work as + month scrolling controls, and &quot;select&quot; boundaries work in the same way as &quot;scroll&quot; but with the date clicked selection </description> Modified: branches/3.1.x/ui/core/src/main/config/component/form.xml =================================================================== --- branches/3.1.x/ui/core/src/main/config/component/form.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/core/src/main/config/component/form.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -62,7 +62,7 @@ </property> <property> <name>prependId</name> - <classname>java.lang.String</classname> + <classname>boolean</classname> <description>The flag indicating whether or not this form should prepend its id to its descendent id during the clientId generation process. If this flag is not set, the default value is true.</description> </property> <property disabled="true"> Modified: branches/3.1.x/ui/dataTable/src/main/config/component/dataGrid.xml =================================================================== --- branches/3.1.x/ui/dataTable/src/main/config/component/dataGrid.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/dataTable/src/main/config/component/dataGrid.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -32,6 +32,7 @@ &html_universal_attributes; &html_table_attributes; &spec_table_attributes; + &html_events; <property disabled="true"> <name>rows</name> </property> Modified: branches/3.1.x/ui/dataTable/src/main/config/component/dataTable.xml =================================================================== --- branches/3.1.x/ui/dataTable/src/main/config/component/dataTable.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/dataTable/src/main/config/component/dataTable.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -31,10 +31,11 @@ &ui_data_attributes; &html_universal_attributes; &html_table_attributes; + &html_events; &spec_table_attributes; <property> <name>ajaxKeys</name> - <classname>java.lang.String</classname> + <classname>java.util.Set</classname> <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property> @@ -99,12 +100,12 @@ <property> <name>componentState</name> - <classname>java.lang.String</classname> + <classname>org.ajax4jsf.model.DataComponentState</classname> <description>It defines EL-binding for a component state for saving or redefinition</description> </property> <property> <name>rowKey</name> - <classname>java.lang.String</classname> + <classname>java.lang.Object</classname> <description> RowKey is a representation of an identifier for a specific data row </description> @@ -123,7 +124,7 @@ </property> <property> <name>value</name> - <classname>java.lang.String</classname> + <classname>java.lang.Object</classname> <description> The current value for this component </description> Modified: branches/3.1.x/ui/dataTable/src/main/config/component/subTable.xml =================================================================== --- branches/3.1.x/ui/dataTable/src/main/config/component/subTable.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/dataTable/src/main/config/component/subTable.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -31,9 +31,10 @@ &ui_component_attributes; &ui_data_attributes; &spec_table_attributes; + &html_events; <property> <name>ajaxKeys</name> - <classname>java.lang.String</classname> + <classname>java.util.Set</classname> <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property disabled="true" hidden="true"> @@ -51,7 +52,7 @@ <property> <name>componentState</name> - <classname>java.lang.String</classname> + <classname>org.ajax4jsf.model.DataComponentState</classname> <description>It defines EL-binding for a component state for saving or redefinition</description> </property> <property> @@ -68,14 +69,14 @@ </property> <property> <name>rowKey</name> - <classname>java.lang.String</classname> + <classname>java.lang.Object</classname> <description> RowKey is a representation of an identifier for a specific data row </description> </property> <property> <name>value</name> - <classname>java.lang.String</classname> + <classname>java.lang.Object</classname> <description> The current value for this component </description> Modified: branches/3.1.x/ui/datascroller/src/main/config/component/datascroller.xml =================================================================== --- branches/3.1.x/ui/datascroller/src/main/config/component/datascroller.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/datascroller/src/main/config/component/datascroller.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -86,7 +86,7 @@ <property> <name>rendered</name> - <classname>java.lang.String</classname> + <classname>boolean</classname> <description>If "false", this component is not rendered</description> </property> <property> Modified: branches/3.1.x/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml =================================================================== --- branches/3.1.x/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -108,7 +108,7 @@ <classname>java.lang.String</classname> <description> Set the corner of the label for the popup to be connected with. - (auto(default), tr, tl, bl, br, where tr – top-right) + (auto(default), tr, tl, bl, br, where tr top-right) </description> <defaultvalue>"auto"</defaultvalue> </property> Modified: branches/3.1.x/ui/jQuery/src/main/config/component/jQuery.xml =================================================================== --- branches/3.1.x/ui/jQuery/src/main/config/component/jQuery.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/jQuery/src/main/config/component/jQuery.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -29,8 +29,8 @@ <name>name</name> <classname>java.lang.String</classname> <description> - The name of the function that will be generated to execute the query. - The name attribute is required if timing attribute equals to "onJScall" + The name of a function that will be generated to execute a query. The "name" attribute is required + if "timing" attribute equals to "onJScall" </description> <defaultvalue>""</defaultvalue> </property> @@ -47,7 +47,7 @@ <name>query</name> <classname>java.lang.String</classname> <description> - The query string that will be executed for given selector. + The query string that is executed for a given selector. </description> <defaultvalue>""</defaultvalue> </property> @@ -55,9 +55,9 @@ <name>timing</name> <classname>java.lang.String</classname> <description> - When to peform the query. Two possible values are "immediate","onload" and "onJScall". + The attribute that defines when to perform the query. The possible values are "immediate","onload" and "onJScall". "immediate" performs the query right away. "onload" adds the task to the - time when document is loaded (the DOM tree is created). "onJScall" allows to invoke the + time when a document is loaded (the DOM tree is created). "onJScall" allows to invoke the query by Javascipt function name defined with "name" attribute. The default value is "immediate". </description> Modified: branches/3.1.x/ui/panelmenu/src/main/config/component/panelMenu.xml =================================================================== --- branches/3.1.x/ui/panelmenu/src/main/config/component/panelMenu.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/panelmenu/src/main/config/component/panelMenu.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -390,7 +390,7 @@ <property> <name>expanded</name> <classname>boolean</classname> - <description>If “true” group will be displayed expanded initially.</description> + <description>If true group will be displayed expanded initially.</description> <defaultvalue>false</defaultvalue> </property> <property> @@ -402,7 +402,7 @@ <property> <name>disabled</name> <classname>boolean</classname> - <description> If “true” sets state of the item to disabled state. “false” is default. </description> + <description> If true sets state of the item to disabled state. false is default. </description> <defaultvalue>false</defaultvalue> </property> <property> @@ -585,7 +585,7 @@ <property> <name>disabled</name> <classname>boolean</classname> - <description> If “true” sets state of the item to disabled state. “false” is default. </description> + <description> If true sets state of the item to disabled state. false is default. </description> <defaultvalue>false</defaultvalue> </property> <property> Modified: branches/3.1.x/ui/tooltip/src/main/config/component/toolTip.xml =================================================================== --- branches/3.1.x/ui/tooltip/src/main/config/component/toolTip.xml 2007-12-21 09:50:26 UTC (rev 4945) +++ branches/3.1.x/ui/tooltip/src/main/config/component/toolTip.xml 2007-12-21 12:35:01 UTC (rev 4946) @@ -97,13 +97,13 @@ <property> <name>mode</name> <classname>java.lang.String</classname> - <description>controls the way of data loading to tooltip and should have following values “client” (default), “ajax”</description> + <description>controls the way of data loading to tooltip and should have following values client (default), ajax</description> <defaultvalue><![CDATA["client"]]></defaultvalue> </property> <property> <name>disabled</name> <classname>boolean</classname> - <description>If false the components is rendered on the client but Js for calling – disabled.</description> + <description>If false the components is rendered on the client but Js for calling disabled.</description> <defaultvalue>false</defaultvalue> </property> <property>