Author: lfryc(a)redhat.com Date: 2010-10-01 12:15:35 -0400 (Fri, 01 Oct 2010) New Revision: 19416 Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java Log: fixed a4j:repeat inside ui:repeat sample regarding to RF-9396 Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-10-01 15:26:52 UTC (rev 19415) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-10-01 16:15:35 UTC (rev 19416) @@ -28,11 +28,11 @@ <ui:composition> <ol> - <ui:repeat value="#{templateBean.dataTableModel}" var="item" id="containerUiRepeat1"> - <li><h:panelGroup columns="1" rendered="#{item == 'row 1'}"> + <ui:repeat value="#{templateBean.dataTableModel}" var="uiRepeatTemplateItem" id="containerUiRepeat1"> + <li><h:panelGroup columns="1" rendered="#{uiRepeatTemplateItem == 'row 1'}"> <ui:decorate template="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> - <h:outputText value="#{item}" rendered="#{item != 'row 1'}" /></li> + <h:outputText value="#{uiRepeatTemplateItem}" rendered="#{uiRepeatTemplateItem != 'row 1'}" /></li> </ui:repeat> </ol> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-10-01 15:26:52 UTC (rev 19415) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-10-01 16:15:35 UTC (rev 19416) @@ -28,11 +28,11 @@ <ui:composition> <ol> - <ui:repeat value="#{templateBean.dataTableModel}" var="item" id="containerUiRepeat2"> - <li><h:panelGroup columns="1" rendered="#{item == 'row 2'}"> + <ui:repeat value="#{templateBean.dataTableModel}" var="uiRepeatTemplateItem" id="containerUiRepeat2"> + <li><h:panelGroup columns="1" rendered="#{uiRepeatTemplateItem == 'row 2'}"> <ui:decorate template="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> - <h:outputText value="#{item}" rendered="#{item != 'row 2'}" /></li> + <h:outputText value="#{uiRepeatTemplateItem}" rendered="#{uiRepeatTemplateItem != 'row 2'}" /></li> </ui:repeat> </ol> Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java 2010-10-01 15:26:52 UTC (rev 19415) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java 2010-10-01 16:15:35 UTC (rev 19416) @@ -31,9 +31,7 @@ import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; -import org.richfaces.tests.metamer.ftest.annotations.Templates; import org.richfaces.tests.metamer.ftest.annotations.Use; -import org.testng.SkipException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -41,7 +39,6 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -@Templates(exclude = { "uiRepeat1", "uiRepeat2" }) public class TestSimple extends AbstractMetamerTest { protected static final int ELEMENTS_TOTAL = 20;