richfaces-svn-commits
April 2011
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 105 discussions
JBoss Rich Faces SVN: r22397 - modules/docs/trunk/Developer_Guide/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-04-08 03:25:17 -0400 (Fri, 08 Apr 2011)
New Revision: 22397
Modified:
modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
Log:
Clarified Maven plug-in installation: RFPL-1415
Modified: modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
===================================================================
--- modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-04-08 03:09:37 UTC (rev 22396)
+++ modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-04-08 07:25:17 UTC (rev 22397)
@@ -360,7 +360,7 @@
</step>
<step>
<para>
- Follow the prompts to install the integration plug-ins. Include the transitive dependencies <guilabel>Maven Integration for Eclipse</guilabel> and <guilabel>Maven Integration for WTP</guilabel>. Both of these dependencies are from the M2Eclipse project.
+ Follow the prompts to install the integration plug-ins. The installation will automatically include the transitive dependencies <guilabel>Maven Integration for Eclipse</guilabel> and <guilabel>Maven Integration for WTP</guilabel>. Both of these dependencies are from the M2Eclipse project.
</para>
</step>
<step>
13 years
- 1
- 0
JBoss Rich Faces SVN: r22396 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-04-07 23:09:37 -0400 (Thu, 07 Apr 2011)
New Revision: 22396
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
Log:
Added placeholder sections for missing tags: RFPL-1419
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml 2011-04-08 02:34:22 UTC (rev 22395)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml 2011-04-08 03:09:37 UTC (rev 22396)
@@ -200,6 +200,16 @@
</para>
</section>
-->
+
+ <section id="sect-Component_Reference-Actions-a4jactionListener">
+ <title><sgmltag><a4j:actionListener></sgmltag></title>
+ <note>
+ <title>Documentation in development</title>
+ <para>
+ The documentation for this tag is still under development. Refer to the generated documentation mentioned in <xref linkend="chap-Component_Reference-Introduction" /> for reference details.
+ </para>
+ </note>
+ </section>
<section id="sect-Component_Reference-Actions-a4jcommandButton">
<title><sgmltag><a4j:commandButton></sgmltag></title>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels.xml 2011-04-08 02:34:22 UTC (rev 22395)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels.xml 2011-04-08 03:09:37 UTC (rev 22396)
@@ -1377,6 +1377,26 @@
</section>
</section>
+
+ <section id="sect-Component_Reference-Actions-richitemChangeListener">
+ <title><sgmltag><rich:itemChangeListener></sgmltag></title>
+ <note>
+ <title>Documentation in development</title>
+ <para>
+ The documentation for this tag is still under development. Refer to the generated documentation mentioned in <xref linkend="chap-Component_Reference-Introduction" /> for reference details.
+ </para>
+ </note>
+ </section>
+
+ <section id="sect-Component_Reference-Actions-richpanelToggleListener">
+ <title><sgmltag><rich:panelToggleListener></sgmltag></title>
+ <note>
+ <title>Documentation in development</title>
+ <para>
+ The documentation for this tag is still under development. Refer to the generated documentation mentioned in <xref linkend="chap-Component_Reference-Introduction" /> for reference details.
+ </para>
+ </note>
+ </section>
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-04-08 02:34:22 UTC (rev 22395)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-04-08 03:09:37 UTC (rev 22396)
@@ -615,6 +615,26 @@
</section>
</section>
+
+ <section id="sect-Component_Reference-Actions-richtreeSelectionChangeListener">
+ <title><sgmltag><rich:treeSelectionChangeListener></sgmltag></title>
+ <note>
+ <title>Documentation in development</title>
+ <para>
+ The documentation for this tag is still under development. Refer to the generated documentation mentioned in <xref linkend="chap-Component_Reference-Introduction" /> for reference details.
+ </para>
+ </note>
+ </section>
+
+ <section id="sect-Component_Reference-Actions-richtreeToggleListener">
+ <title><sgmltag><rich:treeToggleListener></sgmltag></title>
+ <note>
+ <title>Documentation in development</title>
+ <para>
+ The documentation for this tag is still under development. Refer to the generated documentation mentioned in <xref linkend="chap-Component_Reference-Introduction" /> for reference details.
+ </para>
+ </note>
+ </section>
</chapter>
13 years
- 1
- 0
JBoss Rich Faces SVN: r22395 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-04-07 22:34:22 -0400 (Thu, 07 Apr 2011)
New Revision: 22395
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml
Log:
Fixing build errors
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml 2011-04-08 02:24:11 UTC (rev 22394)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml 2011-04-08 02:34:22 UTC (rev 22395)
@@ -268,6 +268,7 @@
</para>
</listitem>
</itemizedlist>
+ </section>
</section>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml 2011-04-08 02:24:11 UTC (rev 22394)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml 2011-04-08 02:34:22 UTC (rev 22395)
@@ -126,6 +126,7 @@
</para>
</listitem>
</itemizedlist>
+ </section>
<section id="sect-Component_Reference-Processing_management-a4jattachQueue">
<title><sgmltag><a4j:attachQueue></sgmltag></title>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml 2011-04-08 02:24:11 UTC (rev 22394)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml 2011-04-08 02:34:22 UTC (rev 22395)
@@ -197,6 +197,7 @@
</para>
</listitem>
</itemizedlist>
+ </section>
</section>
</chapter>
13 years
- 1
- 0
JBoss Rich Faces SVN: r22394 - modules/docs/trunk/Developer_Guide/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-04-07 22:24:11 -0400 (Thu, 07 Apr 2011)
New Revision: 22394
Modified:
modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
Log:
Revised Maven integration section: RFPL-1415
Modified: modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
===================================================================
--- modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-04-08 01:06:44 UTC (rev 22393)
+++ modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-04-08 02:24:11 UTC (rev 22394)
@@ -317,13 +317,9 @@
The <computeroutput>BUILD SUCCESSFUL</computeroutput> message indicates the project has been assembled and is ready to import into an IDE (integrated development environment), such as <productname>JBoss Tools</productname>.
</para>
</step>
-
- <step id="step-Developer_Guide-Using_RichFaces_with_Maven-Import_the_project_into_an_IDE">
- <title>Import the project into an IDE</title>
- <para>
- To import the project into <productname>Eclipse</productname>, either use Maven to prepare the project or import it directly using <productname>JBoss Tools</productname>.
- </para>
- <stepalternatives>
+
+ <!--deprecated-->
+ <!--
<step>
<title>Use <application>Maven</application> to prepare the project for <application>Eclipse</application></title>
<substeps>
@@ -341,37 +337,58 @@
</step>
</substeps>
</step>
+ -->
+
+ <step id="step-Developer_Guide-Using_RichFaces_with_Maven-Import_the_project_into_an_IDE">
+ <title>Import the project into an IDE</title>
+ <para>
+ To import the project into <productname>Eclipse</productname> and <productname>JBoss Tools</productname>, use the JBoss Maven Integration plug-ins. These plug-ins work with plug-ins from the M2Eclipse project to import Maven projects.
+ </para>
+ <substeps>
<step>
- <title>Import directly using <productname>JBoss Tools</productname></title>
- <para>
- <productname>JBoss Tools</productname> contains the following plug-ins to import Maven projects:
- </para>
- <itemizedlist>
- <listitem>
+ <title>Install the plug-ins</title>
+ <substeps>
+ <step>
<para>
- JBoss Maven Integration
+ Choose <menuchoice><guimenu>Help</guimenu><guimenuitem>Install New Software</guimenuitem></menuchoice> from the Eclipse menu.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
- JBoss Maven JSF Integration
+ Select the JBoss Tools update site to use, then open the <guilabel>Maven Support</guilabel> group and select the <guilabel>JBoss Maven Integration</guilabel> and <guilabel>JBoss Maven JSF Configurator</guilabel> plug-ins.
</para>
- </listitem>
- </itemizedlist>
- <substeps>
+ </step>
<step>
<para>
- Install <productname>JBoss Tools</productname> using the instructions on the <citetitle>JBoss Tools Downloads</citetitle> site at <ulink url="http://www.jboss.org/tools/download.html" />.
- </para>
+ Follow the prompts to install the integration plug-ins. Include the transitive dependencies <guilabel>Maven Integration for Eclipse</guilabel> and <guilabel>Maven Integration for WTP</guilabel>. Both of these dependencies are from the M2Eclipse project.
+ </para>
</step>
<step>
<para>
- With the plug-ins installed, open the importing wizard by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice> from the menu. Select <menuchoice><guimenu>Maven</guimenu><guimenuitem>Existing Maven Projects</guimenuitem></menuchoice> as the import source and choose the <filename>pom.xml</filename> file for your project.
+ Restart Eclipse to finish the installation.
</para>
</step>
</substeps>
</step>
- </stepalternatives>
+ <step>
+ <title>Open the importing wizard</title>
+ <para>
+ With the plug-ins installed, open the importing wizard by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice> from the menu.
+ </para>
+ </step>
+ <step>
+ <title>Select the project</title>
+ <para>
+ Select <menuchoice><guimenu>Maven</guimenu><guimenuitem>Existing Maven Projects</guimenuitem></menuchoice> as the import source and choose the directory with the <filename>pom.xml</filename> file for your project.
+ </para>
+ </step>
+ </substeps>
+ <note>
+ <title>Exporting from Maven</title>
+ <para>
+ The ability to prepare the project for Eclipse and export it using Maven is deprecated in RichFaces 4.0. The process does not support JBoss integration-specific features, such as JSF Facets.
+ </para>
+ </note>
</step>
</procedure>
13 years
- 1
- 0
JBoss Rich Faces SVN: r22393 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-04-07 21:06:44 -0400 (Thu, 07 Apr 2011)
New Revision: 22393
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
Log:
Fixed treeModelAdaptor description for roots and nodes: RFPL-1418
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-04-08 00:41:01 UTC (rev 22392)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-04-08 01:06:44 UTC (rev 22393)
@@ -542,7 +542,7 @@
The <sgmltag><rich:treeModelRecursiveAdaptor></sgmltag> component is an extension of the <sgmltag><rich:treeModelAdaptor></sgmltag> component. As such, the <sgmltag><rich:treeModelRecursiveAdaptor></sgmltag> component uses all of the same attributes. Refer to <xref linkend="sect-Component_Reference-Tree_adaptors-richtreeModelAdaptor" /> for details on the <sgmltag><rich:treeModelAdaptor></sgmltag> component.
</para>
<para>
- In addition, the <sgmltag><rich:treeModelRecursiveAdaptor></sgmltag> component requires the <varname>root</varname> attribute. The <varname>root</varname> attribute defines the collection to use at the top of the recursion. For subsequent levels, the <varname>node</varname> attribute is used for the collection.
+ In addition, the <sgmltag><rich:treeModelRecursiveAdaptor></sgmltag> component requires the <varname>roots</varname> attribute. The <varname>roots</varname> attribute defines the collection to use at the top of the recursion. For subsequent levels, the <varname>nodes</varname> attribute is used for the collection.
</para>
<para>
<xref linkend="exam-Component_Reference-richtreeModelRecursiveAdaptor-Basic_usage" /> demonstrates how the <sgmltag><rich:treeModelRecursiveAdaptor></sgmltag> component can be used in conjunction with the <sgmltag><rich:treeModelAdaptor></sgmltag> component to recursively iterate through a file system and create a tree of directories and files.
13 years
- 1
- 0
JBoss Rich Faces SVN: r22392 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-04-07 20:41:01 -0400 (Thu, 07 Apr 2011)
New Revision: 22392
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Containers.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Resources.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml
Log:
Finished updating reference tables: RFPL-1414
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml 2011-04-07 20:34:09 UTC (rev 22391)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml 2011-04-08 00:41:01 UTC (rev 22392)
@@ -34,6 +34,37 @@
<programlisting language="XML" role="XML"><xi:include href="extras/exam-Component_Reference-a4jajax-a4jajax_example.xml_sample" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
</example>
</section>
+
+ <section id="sect-Component_Reference-a4jajax-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>client-behavior-renderer-type</parameter>: <classname>org.ajax4jsf.behavior.Ajax</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>behavior-id</parameter>: <classname>org.ajax4jsf.behavior.Ajax</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.AjaxHandler</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>behavior-class</parameter>: <classname>org.ajax4jsf.component.behavior.AjaxBehavior</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>client-behavior-renderer-class</parameter>: <classname>org.ajax4jsf.renderkit.AjaxBehaviorRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
</section>
<section id="sect-Component_Reference-Actions-a4jparam">
@@ -109,6 +140,32 @@
</example>
</section>
+ <section id="sect-Component_Reference-a4jparam-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Parameter</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIParameter</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>javax.faces.Parameter</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.ParameterHandler</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
</section>
<!-- FIXME not in M2 -->
@@ -187,6 +244,31 @@
-->
</section>
+ <section id="sect-Component_Reference-a4jcommandButton-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.CommandButton</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UICommandButton</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>javax.faces.Command</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.CommandButtonRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+
</section>
<section id="sect-Component_Reference-Actions-a4jcommandLink">
@@ -223,6 +305,32 @@
The <sgmltag><a4j:commandLink></sgmltag> uses the <varname>click</varname> event instead of the <varname>submit</varname> event.
</para>
</section>
+
+ <section id="sect-Component_Reference-a4jcommandLink-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.CommandLink</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UICommandLink</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>javax.faces.Command</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.CommandLinkRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
</section>
<!-- TODO not in M2 -->
@@ -299,6 +407,32 @@
The <sgmltag><a4j:jsFunction></sgmltag> component allows the use of the <sgmltag><a4j:param></sgmltag> component or the JavaServer Faces <sgmltag><f:param></sgmltag> component to pass any number of parameters for the JavaScript function.
</para>
</section>
+
+ <section id="sect-Component_Reference-a4jjsFunction-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Function</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIFunction</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>javax.faces.Command</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.FunctionRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
</section>
<section id="sect-Component_Reference-Actions-a4jpoll">
@@ -344,6 +478,37 @@
</section>
-->
+ <section id="sect-Component_Reference-a4jpoll-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Poll</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIPoll</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Poll</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.PollRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.AjaxPollHandler</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
</section>
<section id="sect-Component_Reference-Actions-a4jpush">
@@ -485,6 +650,32 @@
</section>
-->
+ <section id="sect-Component_Reference-a4jpush-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Push</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIPush</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Push</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.PushRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
</section>
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Containers.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Containers.xml 2011-04-07 20:34:09 UTC (rev 22391)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Containers.xml 2011-04-08 00:41:01 UTC (rev 22392)
@@ -130,6 +130,32 @@
</para>
</section>
+ <section id="sect-Component_Reference-a4joutputPanel-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.OutputPanel</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIOutputPanel</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>javax.faces.Panel</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.OutputPanelRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
</section>
<!-- TODO not in M2 -->
@@ -198,6 +224,27 @@
<para>
Regions can be nested, in which case only the parent region of the component initiating the request will be processed.
</para>
+
+ <section id="sect-Component_Reference-a4jregion-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Region</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIRegion</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.AjaxContainer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
</section>
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml 2011-04-07 20:34:09 UTC (rev 22391)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml 2011-04-08 00:41:01 UTC (rev 22392)
@@ -101,6 +101,31 @@
</listitem>
</itemizedlist>
</section>
+
+ <section id="sect-Component_Reference-a4jqueue-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Queue</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIQueue</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Queue</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.QueueRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
<section id="sect-Component_Reference-Processing_management-a4jattachQueue">
<title><sgmltag><a4j:attachQueue></sgmltag></title>
@@ -149,6 +174,37 @@
</para>
</example>
</section>
+
+ <section id="sect-Component_Reference-a4jattachQueue-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.AttachQueue</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIAttachQueue</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.AttachQueue</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.AttachQueueRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.AttachQueueHandler</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
</section>
</section>
@@ -234,6 +290,32 @@
</para>
</note>
</section>
+
+ <section id="sect-Component_Reference-a4jlog-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.AjaxLog</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIAjaxLog</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.AjaxLog</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.AjaxLogRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
<section id="sect-Component_Reference-a4jlog-Style_classes_and_skin_parameters">
<title>Style classes and skin parameters</title>
@@ -340,6 +422,32 @@
</variablelist>
</section>
+ <section id="sect-Component_Reference-a4jstatus-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Status</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIStatus</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Status</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.StatusRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
</section>
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Resources.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Resources.xml 2011-04-07 20:34:09 UTC (rev 22391)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Resources.xml 2011-04-08 00:41:01 UTC (rev 22392)
@@ -312,6 +312,32 @@
</para>
</note>
</section>
+
+ <section id="sect-Component_Reference-a4jmediaOutput-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.MediaOutput</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIMediaOutput</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.MediaOutput</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.MediaOutputRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
</section>
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml 2011-04-07 20:34:09 UTC (rev 22391)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml 2011-04-08 00:41:01 UTC (rev 22392)
@@ -90,8 +90,40 @@
If no client-side validation method exists for a registered server-side validator, Ajax fall-back is used. The <sgmltag><rich:validator></sgmltag> behavior invokes all available client-side validators. If all the client-side validators return valid, RichFaces performs an Ajax request to invoke the remaining validators on the server side.
</para>
</section>
+
+ <section id="sect-Component_Reference-richvalidator-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>client-behavior-renderer-type</parameter>: <classname>org.richfaces.ClientValidatorRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>behavior-id</parameter>: <classname>org.richfaces.behavior.ClientValidator</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.ClientValidatorHandler</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>behavior-class</parameter>: <classname>org.ajax4jsf.component.behavior.ClientValidatorImpl</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>client-behavior-renderer-class</parameter>: <classname>org.richfaces.renderkit.html.ClientValidatorRenderer</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
</section>
-
+
+ <!-- <rich:graphValidator> -->
<section id="sect-Component_Reference-Validation-richgraphValidator">
<title><sgmltag><rich:graphValidator></sgmltag> object validation</title>
<para>
@@ -140,6 +172,31 @@
</mediaobject>
</example>
</section>
+
+ <section id="sect-Component_Reference-richgraphValidator-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.GraphValidator</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIGraphValidator</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.GraphValidator</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.GraphValidatorHandler</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
</section>
</chapter>
13 years
- 1
- 0
JBoss Rich Faces SVN: r22391 - in branches/4.0.X: cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component and 14 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2011-04-07 16:34:09 -0400 (Thu, 07 Apr 2011)
New Revision: 22391
Modified:
branches/4.0.X/
branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java
branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java
branches/4.0.X/cdk/maven-javascript-plugin/
branches/4.0.X/core/api/src/main/java/org/richfaces/el/ELContextWrapper.java
branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml
branches/4.0.X/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml
branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java
branches/4.0.X/ui/core/ui/src/test-old/java/org/ajax4jsf/component/QueueScriptedTest.java
branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml
branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-disabled.xhtml
branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-discovery-base.xhtml
branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-both.xhtml
branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-form.xhtml
branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-view.xhtml
branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-implicit-global.xhtml
branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-legacy.xhtml
branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml
branches/4.0.X/ui/validator/
branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java
branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java
branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java
branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java
branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java
Log:
merge from trunk: RESOLVED - issue RF-10434: CSV: validatorMessage defined at component not influece the message for client validation.
Property changes on: branches/4.0.X
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk:22383
Modified: branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java
===================================================================
--- branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -35,9 +35,11 @@
import javax.faces.event.ValueChangeEvent;
import javax.faces.event.ValueChangeListener;
+import org.richfaces.cdk.annotations.Alias;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.Description;
import org.richfaces.cdk.annotations.Event;
+import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.Facet;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
@@ -102,8 +104,19 @@
@Attribute
public abstract void setBarValue(List<Object> bar);
- @Attribute(signature = @Signature(parameters = String.class, returnType = Boolean.class))
- public abstract MethodExpression getMethodExpressionListener();
+ @Attribute(
+ aliases={@Alias("getAction")},
+ defaultValue="",
+ description=@Description(),
+ events={@EventName(value="click",defaultEvent=true)},
+ hidden=false,
+ literal=false,
+ passThrough=false,
+ readOnly=true,
+ required=false,
+ suggestedValue="#{foo}",
+ signature = @Signature(parameters = String.class, returnType = Boolean.class))
+ public abstract MethodExpression getMethodExpression();
@Attribute(signature = @Signature(parameters = {String.class,Integer.class}, returnType = int.class))
public abstract MethodBinding getMethodBindingListener();
Modified: branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java
===================================================================
--- branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -26,6 +26,7 @@
import javax.faces.component.UIComponent;
import org.richfaces.cdk.annotations.Attribute;
+import org.richfaces.cdk.annotations.Description;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.Facet;
@@ -48,7 +49,7 @@
AUTO
}
- @Facet
+ @Facet(generate=true,description=@Description())
UIComponent getHeader();
/**
* @return
Property changes on: branches/4.0.X/cdk/maven-javascript-plugin
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/core/api/src/main/java/org/richfaces/el/ELContextWrapper.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml
===================================================================
--- branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml 2011-04-07 20:34:09 UTC (rev 22391)
@@ -23,9 +23,9 @@
</h:inputText>
<h:outputText id="out" value="#{test.value}"></h:outputText>
<csv:message id="uiMessage" for="text" />
- <h:outputLabel for="number" value="Four annotations for number"/>
- <h:inputText id="number" value="#{test.numbers}">
- <csv:validator onbeforesubmit="alert('Before')"/>
+ <h:outputLabel for="number" value="Four annotations for number, with custom msg"/>
+ <h:inputText id="number" value="#{test.numbers}" converterMessage="Nor a number" validatorMessage="Wrong number">
+ <csv:validator event="blur"/>
</h:inputText>
<h:outputText id="outNum" value="#{test.numbers}"></h:outputText>
<csv:message id="uiNumMessage" for="number" />
Modified: branches/4.0.X/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml
===================================================================
--- branches/4.0.X/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml 2011-04-07 20:34:09 UTC (rev 22391)
@@ -31,8 +31,8 @@
<h:outputText id="dblrangeOut" value="#{test.doubleValue}"></h:outputText>
<csv:message for="dblrange" />
- <h:outputLabel for="longrange" value="Text long range from 2 to 5:" />
- <h:inputText id="longrange" value="#{test.longValue}">
+ <h:outputLabel for="longrange" value="Text long range from 2 to 5, custom msg:" />
+ <h:inputText id="longrange" value="#{test.longValue}" converterMessage="Nor a number" validatorMessage="Wrong number">
<f:validateLongRange minimum="2" maximum="5" />
<csv:validator event="blur" />
</h:inputText>
@@ -44,7 +44,7 @@
<csv:validator/>
</h:commandButton>
<a4j:commandButton value="AJAX Submit with client-side validation" render="lengthOut,dblrangeOut,longrangeOut">
- <csv:validator/>
+ <csv:validator event="click"/>
</a4j:commandButton>
</h:form>
<csv:messages />
Property changes on: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-disabled.xhtml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-discovery-base.xhtml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-both.xhtml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-form.xhtml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-view.xhtml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-implicit-global.xhtml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-legacy.xhtml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/core/ui/src/test-old/java/org/ajax4jsf/component/QueueScriptedTest.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/4.0.X/ui/validator
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/ui/validator:22079
+ /trunk/ui/validator:22079,22383
Modified: branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java
===================================================================
--- branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -17,9 +17,10 @@
* <p class="changed_added_4_0">Get all constrains for given EL-expression</p>
* @param context
* @param expression
+ * @param message TODO
* @return
*/
- Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,Class<?> ...groups);
+ Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,String message, Class<?> ...groups);
/**
* <p class="changed_added_4_0">Validate expression for a new value.</p>
Modified: branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java
===================================================================
--- branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -12,6 +12,6 @@
*/
public interface FacesConverterService {
- ConverterDescriptor getConverterDescription(FacesContext context,EditableValueHolder input, Converter converter);
+ ConverterDescriptor getConverterDescription(FacesContext context,EditableValueHolder input, Converter converter, String converterMessage);
}
Modified: branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java
===================================================================
--- branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -7,5 +7,5 @@
public interface FacesValidatorService {
- ValidatorDescriptor getValidatorDescription(FacesContext context,EditableValueHolder component, Validator validator);
+ ValidatorDescriptor getValidatorDescription(FacesContext context,EditableValueHolder component, Validator validator, String message);
}
Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -245,7 +245,8 @@
}
if(null != converter){
FacesConverterService converterService = ServiceTracker.getService(facesContext, FacesConverterService.class);
- return converterService.getConverterDescription(facesContext, input, converter);
+ String converterMessage = (String) component.getAttributes().get("converterMessage");
+ return converterService.getConverterDescription(facesContext, input, converter, converterMessage);
} else {
return null;
}
@@ -282,6 +283,7 @@
Validator[] facesValidators = input.getValidators();
FacesContext facesContext = context.getFacesContext();
if (facesValidators.length > 0) {
+ String validatorMessage = (String) component.getAttributes().get("validatorMessage");
boolean beanValidatorsProcessed = false;
FacesValidatorService facesValidatorService = ServiceTracker.getService(facesContext,
FacesValidatorService.class);
@@ -291,11 +293,11 @@
if (null != valueExpression && !beanValidatorsProcessed) {
BeanValidatorService beanValidatorService = ServiceTracker.getService(facesContext,
BeanValidatorService.class);
- validators.addAll(beanValidatorService.getConstrains(facesContext, valueExpression, getGroups()));
+ validators.addAll(beanValidatorService.getConstrains(facesContext, valueExpression, validatorMessage, getGroups()));
beanValidatorsProcessed = true;
}
} else {
- validators.add(facesValidatorService.getValidatorDescription(facesContext, input, validator));
+ validators.add(facesValidatorService.getValidatorDescription(facesContext, input, validator, validatorMessage));
}
}
}
Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -24,6 +24,7 @@
import javax.validation.metadata.ElementDescriptor.ConstraintFinder;
import javax.validation.metadata.PropertyDescriptor;
+import org.richfaces.component.util.Strings;
import org.richfaces.el.ValueDescriptor;
import org.richfaces.el.ValueExpressionAnalayser;
@@ -54,7 +55,7 @@
* javax.el.ValueExpression, java.lang.Class<?>[])
*/
public Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,
- Class<?>... groups) {
+ String message, Class<?>... groups) {
try {
ValueDescriptor propertyDescriptor = analayser.getPropertyDescriptor(context, expression);
@@ -62,7 +63,7 @@
return Collections.emptySet();
}
- return processBeanAttribute(context, propertyDescriptor, groups);
+ return processBeanAttribute(context, propertyDescriptor, message, groups);
} catch (ELException e) {
return Collections.emptySet();
}
@@ -73,7 +74,7 @@
}
Collection<ValidatorDescriptor> processBeanAttribute(FacesContext context, ValueDescriptor descriptor,
- Class<?>... groups) {
+ String msg, Class<?>... groups) {
PropertyDescriptor constraintsForProperty =
getValidator(context).getConstraintsForClass(descriptor.getBeanType()).getConstraintsForProperty(
descriptor.getName());
@@ -87,23 +88,23 @@
.getConstraintDescriptors();
// ContextHolder is an arbitrary object, it will depend on the implementation
- Set<ValidatorDescriptor> descriptors = new HashSet<ValidatorDescriptor>(constraints.size());
- processConstraints(context, constraints, descriptors);
- return descriptors;
+ FacesMessage message = Strings.isEmpty(msg)?null:new FacesMessage(FacesMessage.SEVERITY_ERROR,msg,msg);
+ return processConstraints(context, constraints, message);
} else {
return Collections.emptySet();
}
}
- void processConstraints(FacesContext context, Set<ConstraintDescriptor<?>> constraints,
- Collection<ValidatorDescriptor> descriptors) {
+ Collection<ValidatorDescriptor> processConstraints(FacesContext context, Set<ConstraintDescriptor<?>> constraints,
+ FacesMessage msg) {
+ Set<ValidatorDescriptor> descriptors = new HashSet<ValidatorDescriptor>(constraints.size());
for (ConstraintDescriptor<?> cd : constraints) {
Annotation a = cd.getAnnotation();
Map<String, Object> parameters = cd.getAttributes();
// TODO if cd.isReportedAsSingleConstraint() make sure than only the root constraint raises an error message
// if one or several of the composing constraints are invalid)
- FacesMessage message = validatorFactory.interpolateMessage(context, cd);
+ FacesMessage message = null == msg?validatorFactory.interpolateMessage(context, cd):msg;
Class<? extends Annotation> validatorClass = findAnnotationClass(a);
BeanValidatorDescriptor beanValidatorDescriptor = new BeanValidatorDescriptor(validatorClass, message);
for (Map.Entry<String, Object> entry : parameters.entrySet()) {
@@ -125,8 +126,9 @@
}
beanValidatorDescriptor.makeImmutable();
descriptors.add(beanValidatorDescriptor);
- processConstraints(context, cd.getComposingConstraints(), descriptors); // process the composing constraints
+ descriptors.addAll(processConstraints(context, cd.getComposingConstraints(), msg)); // process the composing constraints
}
+ return descriptors;
}
private Class<? extends Annotation> findAnnotationClass(Annotation a) {
Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -38,9 +38,9 @@
* @see org.richfaces.validator.FacesConverterService#getConverterDescription(javax.faces.context.FacesContext,
* javax.faces.convert.Converter)
*/
- public ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter) {
+ public ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter, String converterMessage) {
// determine converter message.
- FacesMessage message = getMessage(context, converter, input);
+ FacesMessage message = getMessage(context, converter, input,converterMessage);
ConverterDescriptorImpl descriptor = new ConverterDescriptorImpl(converter.getClass(), message);
fillParameters(descriptor, converter);
descriptor.makeImmutable();
Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -19,7 +19,7 @@
* @see org.richfaces.validator.BeanValidatorService#getConstrains(javax.faces.context.FacesContext, javax.el.ValueExpression, java.lang.Class<?>[])
*/
public Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,
- Class<?>... groups) {
+ String message, Class<?>... groups) {
return Collections.emptySet();
}
Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -53,14 +53,18 @@
* @param context
* @param component
* @param input TODO
+ * @param msg
* @return
*/
- public FacesMessage getMessage(FacesContext context, T component, EditableValueHolder input) {
- String messageId = getMessageId(component);
- return MessageFactory.createMessage(context, messageId);
+ public FacesMessage getMessage(FacesContext context, T component, EditableValueHolder input, String msg) {
+ if (null == msg) {
+ String messageId = getMessageId(component);
+ return MessageFactory.createMessage(context, messageId);
+ } else {
+ return new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg);
+ }
}
-
protected void setLabelParameter(EditableValueHolder input, FacesValidatorDescriptor descriptor) {
if (input instanceof UIComponent) {
UIComponent component = (UIComponent) input;
Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -30,8 +30,8 @@
* @see org.richfaces.validator.FacesValidatorService#getValidatorDescription(javax.faces.context.FacesContext,
* javax.faces.validator.Validator)
*/
- public ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder input, Validator validator) {
- FacesMessage message = getMessage(context, validator, input);
+ public ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder input, Validator validator, String validatorMessage) {
+ FacesMessage message = getMessage(context, validator, input,validatorMessage);
FacesValidatorDescriptor descriptor = new FacesValidatorDescriptor(validator.getClass(), message);
setLabelParameter(input, descriptor);
fillParameters(descriptor, validator);
Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -3,10 +3,13 @@
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
+import java.util.Collections;
+
import javax.faces.convert.Converter;
import javax.faces.convert.NumberConverter;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.jboss.test.faces.mock.Mock;
import org.jboss.test.faces.mock.MockTestRunner;
import org.jboss.test.faces.mock.Stub;
@@ -45,7 +48,7 @@
public void setupService() {
expect(factory.getInstance(FacesConverterService.class)).andStubReturn(converterService);
converterCapture = new Capture<Converter>();
- expect(converterService.getConverterDescription(same(environment.getFacesContext()), same(input), capture(converterCapture)))
+ expect(converterService.getConverterDescription(same(environment.getFacesContext()), same(input), capture(converterCapture), EasyMock.<String>isNull()))
.andStubReturn(descriptor);
ServiceTracker.setFactory(factory);
}
@@ -66,6 +69,7 @@
public void testGetClientConverterFromComponent() throws Exception {
NumberConverter converter = new NumberConverter();
expect(input.getConverter()).andReturn(converter);
+ expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap());
checkConverter(converter);
}
@@ -79,6 +83,7 @@
@Test
public void testGetClientConverterByType() throws Exception {
setupConverterFromApplication(converter);
+ expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap());
checkConverter(converter);
}
Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -4,6 +4,7 @@
import static org.junit.Assert.*;
import java.util.Collection;
+import java.util.Collections;
import javax.el.ValueExpression;
import javax.faces.validator.BeanValidator;
@@ -96,7 +97,7 @@
private void setupBeanValidator(ValidatorDescriptor... validators) {
expect(input.getValidators()).andStubReturn(new Validator[]{new BeanValidator()});
- expect(validatorService.getConstrains(environment.getFacesContext(), expression, DEFAULT_GROUP)).andStubReturn(
+ expect(validatorService.getConstrains(environment.getFacesContext(), expression, null, DEFAULT_GROUP)).andStubReturn(
Lists.newArrayList(validators));
}
@@ -107,7 +108,7 @@
ValidatorDescriptor validatorDescriptor = environment.createMock(ValidatorDescriptor.class);
expect((Class) validatorDescriptor.getImplementationClass()).andStubReturn(validator.getClass());
expect(validatorDescriptor.getMessage()).andStubReturn(VALIDATION_ERROR);
- expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), input, validator))
+ expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), input, validator, null))
.andStubReturn(validatorDescriptor);
}
}
@@ -123,6 +124,7 @@
public void testComponentValidator() throws Exception {
setupComponentValidator(validator);
setupBeanValidator();
+ expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap());
Collection<ValidatorDescriptor> validators = checkValidator();
assertEquals(1, validators.size());
ValidatorDescriptor validatorDescriptor = Iterables.getOnlyElement(validators);
@@ -134,6 +136,7 @@
@Test
public void testBeanValidators() throws Exception {
setupBeanValidator(beanValidatorDescriptor);
+ expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap());
Collection<ValidatorDescriptor> validators = checkValidator();
assertEquals(1, validators.size());
ValidatorDescriptor validatorDescriptor = Iterables.getOnlyElement(validators);
Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -63,7 +63,7 @@
private Object getErrorMessage(Converter converter) {
ConverterServiceImpl converterService = new ConverterServiceImpl();
- FacesMessage message = converterService.getMessage(facesEnvironment.getFacesContext(), converter, input);
+ FacesMessage message = converterService.getMessage(facesEnvironment.getFacesContext(), converter, input,null);
return new Message(message);
}
Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -80,7 +80,7 @@
private Object getErrorMessage(Validator validator) {
FacesValidatorServiceImpl validatorService = new FacesValidatorServiceImpl();
- FacesMessage message = validatorService.getMessage(facesEnvironment.getFacesContext(), validator, input);
+ FacesMessage message = validatorService.getMessage(facesEnvironment.getFacesContext(), validator, input,null);
return new Message(message);
}
Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -103,7 +103,7 @@
private Collection<ValidatorDescriptor> expectValidatorsWithGroups(Class<?>[] groups, Class<? extends Annotation>... validators) {
controller.replay();
- Collection<ValidatorDescriptor> constrains = validatorService.getConstrains(environment.getFacesContext(), expression,groups);
+ Collection<ValidatorDescriptor> constrains = validatorService.getConstrains(environment.getFacesContext(), expression,null, groups);
controller.verify();
assertEquals(validators.length, constrains.size());
for (final Class<? extends Annotation> class1 : validators) {
Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -70,7 +70,7 @@
public void getConverterClass() throws Exception {
converter = new BooleanConverter();
controller.replay();
- ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter);
+ ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter, null);
assertEquals(converter.getClass(), converterDescription.getImplementationClass());
}
@@ -85,7 +85,7 @@
facesMessage = e.getFacesMessage();
}
assertNotNull(facesMessage);
- ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter);
+ ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter, null);
String summary = converterDescription.getMessage().getSummary();
summary = summary.replace("{2}", "foo");
summary = summary.replace("'{0}'", "abc");
@@ -102,7 +102,7 @@
converter.setType("both");
converter.setTimeZone(TimeZone.getTimeZone("EST"));
controller.replay();
- ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter);
+ ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter, null);
Map<String, ? extends Object> additionalParameters = converterDescription.getAdditionalParameters();
assertEquals("short", additionalParameters.get("dateStyle"));
assertEquals("MM/DD/YYYY", additionalParameters.get("pattern"));
Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java
===================================================================
--- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2011-04-07 15:37:35 UTC (rev 22390)
+++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2011-04-07 20:34:09 UTC (rev 22391)
@@ -65,7 +65,7 @@
public void getConverterClass() throws Exception {
validator = new LengthValidator();
controller.replay();
- ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator);
+ ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator, null);
assertEquals(validator.getClass(), validatorDescription.getImplementationClass());
}
@@ -80,7 +80,7 @@
facesMessage = e.getFacesMessage();
}
assertNotNull(facesMessage);
- ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator);
+ ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator, null);
String summary = validatorDescription.getMessage().getSummary();
summary = summary.replace("{0}", "foo");
assertEquals(facesMessage.getSummary(), summary);
13 years
- 1
- 0
JBoss Rich Faces SVN: r22390 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-07 11:37:35 -0400 (Thu, 07 Apr 2011)
New Revision: 22390
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
Log:
https://issues.jboss.org/browse/RFPL-1125
invalidating of session in MyFaces fixed
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-04-07 12:42:38 UTC (rev 22389)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-04-07 15:37:35 UTC (rev 22390)
@@ -34,6 +34,7 @@
import javax.faces.FacesException;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
+import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import javax.faces.event.AjaxBehaviorEvent;
@@ -337,15 +338,17 @@
}
public String invalidateSession() {
- Object session = FacesContext.getCurrentInstance().getExternalContext().getSession(true);
+ ExternalContext ec = FacesContext.getCurrentInstance().getExternalContext();
+ Object session = ec.getSession(false);
+
if (session == null) {
return "/index";
}
if (session instanceof HttpSession) {
((HttpSession) session).invalidate();
- return FacesContext.getCurrentInstance().getViewRoot().getViewId() + "?faces-redirect=true";
+ return FacesContext.getCurrentInstance().getViewRoot().getViewId();
}
throw new IllegalStateException();
@@ -408,7 +411,7 @@
*/
public void itemChangeListener(ItemChangeEvent event) {
logToPage("* item changed: " + (event.getOldItem() == null ? null : event.getOldItem().getId()) + " -> "
- + event.getNewItem().getId());
+ + event.getNewItem().getId());
}
/**
13 years
- 1
- 0
JBoss Rich Faces SVN: r22389 - in modules/tests/metamer/trunk: application/src/main/webapp/templates and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-07 08:42:38 -0400 (Thu, 07 Apr 2011)
New Revision: 22389
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsiblePanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richPanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richPopupPanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richTabPanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richTogglePanel.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
Log:
https://issues.jboss.org/browse/RFPL-945
added new templates - rich:popupPanel, rich:tabPanel, rich:panel, rich:togglePanel, rich:collapsiblePanel
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-07 09:17:28 UTC (rev 22388)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-07 12:42:38 UTC (rev 22389)
@@ -34,13 +34,18 @@
REDDIV("redDiv", "Red div", ""),
BLUEDIV("blueDiv", "Blue div", ""),
RICHACCORDION("richAccordion", "Rich Accordion", ""),
+ RICHCOLLAPSIBLEPANEL("richCollapsiblePanel", "Rich Collapsible Panel", ""),
RICHCOLLAPSIBLESUBTABLE("richCollapsibleSubTable", "Rich Collapsible Sub Table", "containerRichCollapsibleSubTable:2:"),
RICHDATATABLE("richDataTable", "Rich Data Table", "containerRichDataTable:2:"),
RICHDATAGRID("richDataGrid", "Rich Data Grid", "containerRichDataGrid:1:"),
RICHEXTENDEDDATATABLE("richExtendedDataTable", "Rich Extended Data Table", "containerRichExtendedDataTable:2:"),
RICHLIST("richList", "Rich List", "containerRichList:2:"),
+ RICHPANEL("richPanel", "Rich Panel", ""),
+ RICHPOPUPPANEL("richPopupPanel", "Rich Popup Panel", ""),
+ RICHTABPANEL("richTabPanel", "Rich Tab Panel", ""),
+ RICHTOGGLEPANEL("richTogglePanel", "Rich Toggle Panel", ""),
HDATATABLE("hDataTable", "JSF Data Table", "containerHDataTable:2:"),
- HPANELGRID ("hPanelGrid", "JSF Panel Grid", "containerHPanelGrid:"),
+ HPANELGRID("hPanelGrid", "JSF Panel Grid", "containerHPanelGrid:"),
UIREPEAT("uiRepeat", "UI Repeat", "containerUiRepeat:1:"),
A4JREPEAT("a4jRepeat", "A4J Repeat", "containerA4JRepeat:1:");
/**
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsiblePanel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsiblePanel.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsiblePanel.xhtml 2011-04-07 12:42:38 UTC (rev 22389)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:collapsiblePanel id="containerRichCollapsiblePanel">
+
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+
+ </rich:collapsiblePanel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richPanel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richPanel.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richPanel.xhtml 2011-04-07 12:42:38 UTC (rev 22389)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:panel id="containerRichPanel" header="Rich Panel">
+
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+
+ </rich:panel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richPopupPanel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richPopupPanel.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richPopupPanel.xhtml 2011-04-07 12:42:38 UTC (rev 22389)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <h:commandButton id="containerOpenPanelButton" value="Call the popup">
+ <rich:componentControl target="containerPopupPanel" operation="show" />
+ </h:commandButton>
+
+ <rich:popupPanel id="containerPopupPanel" domElementAttachment="parent" header="Popup panel"
+ minHeight="400" minWidth="700" moveable="true" resizeable="true" show="true" >
+ <f:facet name="controls">
+ <h:outputLink value="#" onclick="#{rich:component('popupPanel')}.hide(); return false;">X</h:outputLink>
+ </f:facet>
+
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+
+ </rich:popupPanel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richTabPanel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richTabPanel.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richTabPanel.xhtml 2011-04-07 12:42:38 UTC (rev 22389)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:tabPanel id="containerRichTabPanel" activeItem="containerItem3">
+
+ <rich:tab id="containerItem1" name="containerItem1" header="Item 1">
+ content of item 1
+ </rich:tab>
+ <rich:tab id="containerItem2" name="containerItem2" header="Item 2">
+ content of item 2
+ </rich:tab>
+ <rich:tab id="containerItem3" name="containerItem3" header="Item 3">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </rich:tab>
+ <rich:tab id="containerItem4" name="containerItem4" header="Item 4" disabled="true">
+ content of item 4
+ </rich:tab>
+ <rich:tab id="containerItem5" name="containerItem5" header="Item 5">
+ content of item 5
+ </rich:tab>
+
+ </rich:tabPanel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richTogglePanel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richTogglePanel.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richTogglePanel.xhtml 2011-04-07 12:42:38 UTC (rev 22389)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <h:commandLink id="tcLink1" value="Item 1">
+ <rich:toggleControl targetPanel="containerRichTogglePanel" targetItem="containerItem1" />
+ </h:commandLink>
+ <h:outputText value=" | " />
+ <h:commandLink id="tcLink2" value="Item 2">
+ <rich:toggleControl targetPanel="containerRichTogglePanel" targetItem="containerItem2" />
+ </h:commandLink>
+ <h:outputText value=" | " />
+ <h:commandLink id="tcLink3" value="Item 3">
+ <rich:toggleControl targetPanel="containerRichTogglePanel" targetItem="containerItem3" />
+ </h:commandLink>
+ <h:outputText value=" | " />
+ <h:commandLink id="tcLink4" value="Item 4">
+ <rich:toggleControl targetPanel="containerRichTogglePanel" targetItem="containerItem4" />
+ </h:commandLink>
+ <h:outputText value=" | " />
+ <h:commandLink id="tcLink5" value="Item 5">
+ <rich:toggleControl targetPanel="containerRichTogglePanel" targetItem="containerItem5" />
+ </h:commandLink>
+ <br/><br/>
+
+ <rich:togglePanel id="containerRichTogglePanel" activeItem="containerItem3">
+
+ <rich:togglePanelItem id="containerItem1" name="containerItem1">
+ content of item 1
+ </rich:togglePanelItem>
+ <rich:togglePanelItem id="containerItem2" name="containerItem2">
+ content of item 2
+ </rich:togglePanelItem>
+ <rich:togglePanelItem id="containerItem3" name="containerItem3">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </rich:togglePanelItem>
+ <rich:togglePanelItem id="containerItem4" name="containerItem4">
+ content of item 4
+ </rich:togglePanelItem>
+ <rich:togglePanelItem id="containerItem5" name="containerItem5">
+ content of item 5
+ </rich:togglePanelItem>
+
+ </rich:togglePanel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-07 09:17:28 UTC (rev 22388)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-07 12:42:38 UTC (rev 22389)
@@ -95,8 +95,9 @@
*/
public static final long TIMEOUT = 5000;
@Inject
- @Templates({"plain", "richAccordion", "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", "richList",
- "a4jRepeat", "hDataTable", "hPanelGrid", "uiRepeat"})
+ @Templates({"plain", "richAccordion", "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable",
+ "richDataGrid", "richList", "richCollapsiblePanel", "richPanel", "richTabPanel", "richTogglePanel",
+ "richPopupPanel", "a4jRepeat", "hDataTable", "hPanelGrid", "uiRepeat"})
private TemplatesList template;
/**
13 years
- 1
- 0
JBoss Rich Faces SVN: r22388 - in modules/tests/metamer/trunk: application/src/main/webapp/templates and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-04-07 05:17:28 -0400 (Thu, 07 Apr 2011)
New Revision: 22388
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/hPanelGrid.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
Log:
added h:panelGrid template (RFPL-945)
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-07 07:08:48 UTC (rev 22387)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-07 09:17:28 UTC (rev 22388)
@@ -40,6 +40,7 @@
RICHEXTENDEDDATATABLE("richExtendedDataTable", "Rich Extended Data Table", "containerRichExtendedDataTable:2:"),
RICHLIST("richList", "Rich List", "containerRichList:2:"),
HDATATABLE("hDataTable", "JSF Data Table", "containerHDataTable:2:"),
+ HPANELGRID ("hPanelGrid", "JSF Panel Grid", "containerHPanelGrid:"),
UIREPEAT("uiRepeat", "UI Repeat", "containerUiRepeat:1:"),
A4JREPEAT("a4jRepeat", "A4J Repeat", "containerA4JRepeat:1:");
/**
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/hPanelGrid.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hPanelGrid.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hPanelGrid.xhtml 2011-04-07 09:17:28 UTC (rev 22388)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+
+ <fieldset>
+ <legend>h:panelGrid</legend>
+
+ <h:panelGrid id="containerHPanelGrid" style="width: 100%">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGrid>
+ </fieldset>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-07 07:08:48 UTC (rev 22387)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-07 09:17:28 UTC (rev 22388)
@@ -96,7 +96,7 @@
public static final long TIMEOUT = 5000;
@Inject
@Templates({"plain", "richAccordion", "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", "richList",
- "a4jRepeat", "hDataTable", "uiRepeat"})
+ "a4jRepeat", "hDataTable", "hPanelGrid", "uiRepeat"})
private TemplatesList template;
/**
13 years
- 1
- 0