Author: ppitonak(a)redhat.com
Date: 2011-04-05 11:59:48 -0400 (Tue, 05 Apr 2011)
New Revision: 22373
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml
Removed:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
Log:
https://issues.jboss.org/browse/RFPL-943
iteration templates refactored
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-05
15:58:59 UTC (rev 22372)
+++
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-05
15:59:48 UTC (rev 22373)
@@ -33,14 +33,10 @@
PLAIN ("plain", "Plain", ""),
REDDIV ("redDiv", "Red div", ""),
BLUEDIV ("blueDiv", "Blue div", ""),
- RICHDATATABLE1 ("richDataTable1", "Rich Data Table Row 1",
"containerRichDataTable1:0:"),
- RICHDATATABLE2 ("richDataTable2", "Rich Data Table Row 2",
"containerRichDataTable2:1:"),
- HDATATABLE1 ("hDataTable1", "JSF Data Table Row 1",
"containerHDataTable1:0:"),
- HDATATABLE2 ("hDataTable2", "JSF Data Table Row 2",
"containerHDataTable1:1:"),
- UIREPEAT1 ("uiRepeat1", "UI Repeat Row 1",
"containerUiRepeat1:0:"),
- UIREPEAT2 ("uiRepeat2", "UI Repeat Row 2",
"containerUiRepeat2:1:"),
- A4JREPEAT1 ("a4jRepeat1", "A4J Repeat Row 1",
"containerA4JRepeat1:0:"),
- A4JREPEAT2 ("a4jRepeat2", "A4J Repeat Row 2",
"containerA4JRepeat2:1:");
+ RICHDATATABLE ("richDataTable", "Rich Data Table",
"containerRichDataTable:2:"),
+ HDATATABLE ("hDataTable", "JSF Data Table",
"containerHDataTable:2:"),
+ UIREPEAT ("uiRepeat", "UI Repeat",
"containerUiRepeat:1:"),
+ A4JREPEAT ("a4jRepeat", "A4J Repeat",
"containerA4JRepeat:1:");
/**
* identifier of a template
Copied: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml
(from rev 22372,
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -0,0 +1,40 @@
+<?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: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>
+
+ <ul>
+ <a4j:repeat value="#{model.simple}"
var="containerA4JRepeatItem" id="containerA4JRepeat2">
+ <li><h:panelGroup rendered="#{containerA4JRepeatItem ==
'row 2'}">
+ <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerA4JRepeatItem}"
rendered="#{containerA4JRepeatItem != 'row 2'}" /></li>
+ </a4j:repeat>
+ </ul>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-04-05
15:58:59 UTC (rev 22372)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -1,40 +0,0 @@
-<?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: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>
-
- <ul>
- <a4j:repeat value="#{model.simple}"
var="containerA4JRepeatItem" id="containerA4JRepeat1">
- <li><h:panelGroup columns="1"
rendered="#{containerA4JRepeatItem == 'row 1'}">
- <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerA4JRepeatItem}"
rendered="#{containerA4JRepeatItem != 'row 1'}" /></li>
- </a4j:repeat>
- </ul>
-
- </ui:composition>
-</html>
\ No newline at end of file
Deleted:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-04-05
15:58:59 UTC (rev 22372)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -1,40 +0,0 @@
-<?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: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>
-
- <ul>
- <a4j:repeat value="#{model.simple}"
var="containerA4JRepeatItem" id="containerA4JRepeat2">
- <li><h:panelGroup columns="1"
rendered="#{containerA4JRepeatItem == 'row 2'}">
- <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerA4JRepeatItem}"
rendered="#{containerA4JRepeatItem != 'row 2'}" /></li>
- </a4j:repeat>
- </ul>
-
- </ui:composition>
-</html>
\ No newline at end of file
Copied: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml
(from rev 22372,
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -0,0 +1,56 @@
+<?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">
+
+ <!--
+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:dataTable value="#{model.simple}"
var="containerHDataTableItem" id="containerHDataTable1">
+
+ <f:facet name="header">
+ JSF Data Table
+ </f:facet>
+
+ <h:column>
+ <f:facet name="header">
+ Column 1
+ </f:facet>
+ #{containerHDataTableItem}
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ Column 2
+ </f:facet>
+ <h:panelGroup rendered="#{containerHDataTableItem == 'row
3'}">
+ <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerHDataTableItem}"
rendered="#{containerHDataTableItem != 'row 3'}" />
+ </h:column>
+
+ </h:dataTable>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted:
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-04-05
15:58:59 UTC (rev 22372)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -1,43 +0,0 @@
-<?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">
-
- <!--
-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:dataTable value="#{model.simple}"
var="containerHDataTableItem" id="containerHDataTable1">
- <h:column>
- <f:facet name="header">
- <h:outputText value="JSF Data Table" />
- </f:facet>
- <h:panelGroup columns="1"
rendered="#{containerHDataTableItem == 'row 1'}">
- <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerHDataTableItem}"
rendered="#{containerHDataTableItem != 'row 1'}" />
- </h:column>
- </h:dataTable>
-
- </ui:composition>
-</html>
\ No newline at end of file
Deleted:
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-04-05
15:58:59 UTC (rev 22372)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -1,43 +0,0 @@
-<?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" >
-
- <!--
-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:dataTable value="#{model.simple}"
var="containerHDataTableItem" id="containerHDataTable1">
- <h:column>
- <f:facet name="header">
- <h:outputText value="JSF Data Table" />
- </f:facet>
- <h:panelGroup columns="1"
rendered="#{containerHDataTableItem == 'row 2'}">
- <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerHDataTableItem}"
rendered="#{containerHDataTableItem != 'row 2'}" />
- </h:column>
- </h:dataTable>
-
- </ui:composition>
-</html>
\ No newline at end of file
Copied:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable.xhtml
(from rev 22372,
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -0,0 +1,55 @@
+<?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:dataTable value="#{model.simple}"
var="containerRichDataTableItem" id="containerRichDataTable">
+
+ <f:facet name="header">
+ Rich Data Table
+ </f:facet>
+
+ <h:column>
+ <f:facet name="header">
+ Column 1
+ </f:facet>
+ #{containerRichDataTableItem}
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ Column 2
+ </f:facet>
+ <h:panelGroup rendered="#{containerRichDataTableItem == 'row
3'}">
+ <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerRichDataTableItem}"
rendered="#{containerRichDataTableItem != 'row 3'}" />
+ </h:column>
+
+ </rich:dataTable>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-04-05
15:58:59 UTC (rev 22372)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -1,43 +0,0 @@
-<?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:dataTable value="#{model.simple}"
var="containerRichDataTableItem" id="containerRichDataTable1"
rowKeyVar="row">
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Rich Data Table" />
- </f:facet>
- <h:panelGroup columns="1"
rendered="#{containerRichDataTableItem == 'row 1'}">
- <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerRichDataTableItem}"
rendered="#{containerRichDataTableItem != 'row 1'}" />
- </rich:column>
- </rich:dataTable>
-
- </ui:composition>
-</html>
\ No newline at end of file
Deleted:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-04-05
15:58:59 UTC (rev 22372)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -1,43 +0,0 @@
-<?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:dataTable value="#{model.simple}"
var="containerRichDataTableItem" id="containerRichDataTable2"
rowKeyVar="row">
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Rich Data Table" />
- </f:facet>
- <h:panelGroup columns="1"
rendered="#{containerRichDataTableItem == 'row 2'}">
- <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerRichDataTableItem}"
rendered="#{containerRichDataTableItem != 'row 2'}" />
- </rich:column>
- </rich:dataTable>
-
- </ui:composition>
-</html>
\ No newline at end of file
Copied: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml
(from rev 22372,
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -0,0 +1,40 @@
+<?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:ui="http://java.sun.com/jsf/facelets">
+
+ <!--
+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>
+
+ <ol>
+ <ui:repeat value="#{model.simple}"
var="containerUiRepeatItem" id="containerUiRepeat2">
+ <li><h:panelGroup rendered="#{containerUiRepeatItem ==
'row 2'}">
+ <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerUiRepeatItem}"
rendered="#{containerUiRepeatItem != 'row 2'}" /></li>
+ </ui:repeat>
+ </ol>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted:
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-04-05
15:58:59 UTC (rev 22372)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -1,39 +0,0 @@
-<?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:ui="http://java.sun.com/jsf/facelets">
-
- <!--
-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>
-
- <ol>
- <ui:repeat value="#{model.simple}"
var="containerUiRepeatItem" id="containerUiRepeat1">
- <li><h:panelGroup columns="1"
rendered="#{containerUiRepeatItem == 'row 1'}">
- <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerUiRepeatItem}"
rendered="#{containerUiRepeatItem != 'row 1'}" /></li>
- </ui:repeat>
- </ol>
-
- </ui:composition>
-</html>
\ No newline at end of file
Deleted:
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-04-05
15:58:59 UTC (rev 22372)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-04-05
15:59:48 UTC (rev 22373)
@@ -1,40 +0,0 @@
-<?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:ui="http://java.sun.com/jsf/facelets">
-
- <!--
-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>
-
- <ol>
- <ui:repeat value="#{model.simple}"
var="containerUiRepeatItem" id="containerUiRepeat2">
- <li><h:panelGroup columns="1"
rendered="#{containerUiRepeatItem == 'row 2'}">
- <ui:decorate
template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerUiRepeatItem}"
rendered="#{containerUiRepeatItem != 'row 2'}" /></li>
- </ui:repeat>
- </ol>
-
- </ui:composition>
-</html>
\ No newline at end of file