[richfaces-svn-commits] JBoss Rich Faces SVN: r17843 - in root/tests/metamer/trunk: src/main/webapp/components/richDataScroller and 3 other directories.

Saturday, 10 July 2010

Author: lfryc(a)redhat.com
Date: 2010-07-10 15:22:56 -0400 (Sat, 10 Jul 2010)
New Revision: 17843

Modified:
   root/tests/metamer/trunk/pom.xml
   root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml
   root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml
   root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml
   root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml
   root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml
  
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml
  
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml
  
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
   root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml
   root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml
Log:
RFPL-466

* all pages with iteration components (DT, EDT, Data Scroller) refactored because of
changed components' namespace
* pom.xml cleaned up

Modified: root/tests/metamer/trunk/pom.xml
===================================================================

--- root/tests/metamer/trunk/pom.xml	2010-07-10 19:22:14 UTC (rev 17842)
+++ root/tests/metamer/trunk/pom.xml	2010-07-10 19:22:56 UTC (rev 17843)
@@ -62,20 +62,6 @@
                 <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.richfaces.ui.iteration</groupId>
-                <artifactId>richfaces-ui-iteration-bom</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.richfaces.ui.misc</groupId>
-                <artifactId>richfaces-ui-misc-bom</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
                 <groupId>org.richfaces.cdk</groupId>
                 <artifactId>annotations</artifactId>
                 <version>${project.version}</version>
@@ -94,11 +80,7 @@
             <groupId>org.richfaces.cdk</groupId>
             <artifactId>annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.richfaces.ui.iteration</groupId>
-            <artifactId>richfaces-ui-iteration-ui</artifactId>
-        </dependency>
-        
+
         <!-- Java Server Faces 2 -->
         <dependency>
             <groupId>${jsf2.api.groupid}</groupId>
@@ -114,7 +96,7 @@
             <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- <dependency>
+        <dependency>
             <groupId>javax.el</groupId>
             <artifactId>el-api</artifactId>
             <scope>compile</scope>
@@ -124,7 +106,7 @@
             <artifactId>el-impl</artifactId>
             <version>2.2</version>
             <scope>runtime</scope>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>

Modified:
root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml
===================================================================
---
root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml	2010-07-10
19:22:14 UTC (rev 17842)
+++
root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml	2010-07-10
19:22:56 UTC (rev 17843)
@@ -23,8 +23,7 @@
 <!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"
-      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:it="http://richfaces.org/iteration"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:rich="http://richfaces.org/rich">
 
     <ui:composition template="/templates/template.xhtml">
 
@@ -45,7 +44,7 @@
                 <a4j:ajax render="richDataTable scroller1"/>
             </h:selectBooleanCheckbox>
             <br/><br/>
-            <it:dataScroller id="scroller1"
+            <rich:dataScroller id="scroller1"
                             
boundaryControls="#{richDataScrollerBean.attributes['boundaryControls']}"
                             
dataTable="#{richDataScrollerBean.attributes['dataTable']}"
                             
fastControls="#{richDataScrollerBean.attributes['fastControls']}"
@@ -70,7 +69,7 @@
 
         <ui:define name="component">
 
-            <it:dataTable id="richDataTable"
+            <rich:dataTable id="richDataTable"
                           rows="9"
                           value="#{richDataScrollerBean.state ? model.capitals :
null}"
                           var="record"
@@ -80,7 +79,7 @@
                     <h:outputText value="There is no data."
style="color: red;"/>
                 </f:facet>
 
-                <it:column id="columnState"
sortBy="#{record.state}">
+                <rich:column id="columnState"
sortBy="#{record.state}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderState"
value="State" />
                     </f:facet>
@@ -89,9 +88,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterState"
value="State" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnCapital"
sortBy="#{record.name}">
+                <rich:column id="columnCapital"
sortBy="#{record.name}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderCapital"
value="Capital" />
                     </f:facet>
@@ -100,10 +99,10 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterCapital"
value="Capital" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
                 <f:facet name="footer">
-                    <it:dataScroller id="scroller2"
+                    <rich:dataScroller id="scroller2"
                             
boundaryControls="#{richDataScrollerBean.attributes['boundaryControls']}"
                             
dataTable="#{richDataScrollerBean.attributes['dataTable']}"
                             
fastControls="#{richDataScrollerBean.attributes['fastControls']}"
@@ -126,7 +125,7 @@
                              />
                 </f:facet>
 
-            </it:dataTable>
+            </rich:dataTable>
         </ui:define>
 
         <ui:define name="outOfTemplateAfter">

Modified:
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml
===================================================================
---
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml	2010-07-10
19:22:14 UTC (rev 17842)
+++
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml	2010-07-10
19:22:56 UTC (rev 17843)
@@ -23,8 +23,7 @@
 <!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"
-      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:it="http://richfaces.org/iteration"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:rich="http://richfaces.org/rich">
 
     <ui:composition template="/templates/template.xhtml">
 
@@ -44,12 +43,12 @@
                 <a4j:ajax render="richDataTable scroller1"/>
             </h:selectBooleanCheckbox>
             <br/><br/>
-            <it:dataScroller id="scroller1" for="richDataTable"
page="#{richDataTableBean.page}" maxPages="7"
render="richDataTable"/>
+            <rich:dataScroller id="scroller1" for="richDataTable"
page="#{richDataTableBean.page}" maxPages="7"
render="richDataTable"/>
         </ui:define>
 
         <ui:define name="component">
 
-            <it:dataTable id="richDataTable"
+            <rich:dataTable id="richDataTable"
                          
filterVar="#{richDataTableBean.attributes['filterVar']}"
                          
filteringListeners="#{richDataTableBean.attributes['filteringListeners']}"
                          
first="#{richDataTableBean.attributes['first']}"
@@ -85,7 +84,7 @@
                     <h:outputText value="Header Facet" />
                 </f:facet>
 
-                <it:column id="columnSex"
sortBy="#{record.sex}">
+                <rich:column id="columnSex"
sortBy="#{record.sex}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderSex"
value="Sex" />
                         <br/>
@@ -97,9 +96,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterSex"
value="Sex" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnName"
sortBy="#{record.name}">
+                <rich:column id="columnName"
sortBy="#{record.name}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderName"
value="Name" />
                         <br/>
@@ -110,9 +109,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterState"
value="Name" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnTitle"
sortBy="#{record.title}">
+                <rich:column id="columnTitle"
sortBy="#{record.title}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderTitle"
value="Title" />
                         <br/>
@@ -123,9 +122,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterTitle"
value="Title" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnSmoker"
sortBy="#{record.smoker}">
+                <rich:column id="columnSmoker"
sortBy="#{record.smoker}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderSmoker"
value="Smoker" />
                         <br/>
@@ -137,9 +136,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterSmoker"
value="Smoker" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnFavoriteColor"
sortBy="#{record.favoriteColor}">
+                <rich:column id="columnFavoriteColor"
sortBy="#{record.favoriteColor}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderFavoriteColor"
value="Favorite Color" />
                         <br/>
@@ -150,9 +149,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterFavoriteColor"
value="Favorite Color" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnNumberOfKids"
sortBy="#{record.numberOfKids}">
+                <rich:column id="columnNumberOfKids"
sortBy="#{record.numberOfKids}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderNumberOfKids"
value="Number of Kids" />
                         <br/>
@@ -163,13 +162,13 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterNumberOfKids"
value="Number of Kids" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
                 <f:facet name="footer">
-                    <it:dataScroller id="scroller2"
for="richDataTable" page="#{richDataTableBean.page}"
maxPages="7" render="richDataTable" />
+                    <rich:dataScroller id="scroller2"
for="richDataTable" page="#{richDataTableBean.page}"
maxPages="7" render="richDataTable" />
                 </f:facet>
 
-            </it:dataTable>
+            </rich:dataTable>
         </ui:define>
 
         <ui:define name="outOfTemplateAfter">

Modified:
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml
===================================================================
---
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml	2010-07-10
19:22:14 UTC (rev 17842)
+++
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml	2010-07-10
19:22:56 UTC (rev 17843)
@@ -23,8 +23,7 @@
 <!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"
-      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:it="http://richfaces.org/iteration"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:rich="http://richfaces.org/rich">
 
     <ui:composition template="/templates/template.xhtml">
 
@@ -44,12 +43,12 @@
                 <a4j:ajax render="richDataTable scroller1"/>
             </h:selectBooleanCheckbox>
             <br/><br/>
-            <it:dataScroller id="scroller1" for="richDataTable"
page="#{richDataTableBean.page}" maxPages="7"
render="richDataTable"/>
+            <rich:dataScroller id="scroller1" for="richDataTable"
page="#{richDataTableBean.page}" maxPages="7"
render="richDataTable"/>
         </ui:define>
 
         <ui:define name="component">
 
-            <it:dataTable id="richDataTable"
+            <rich:dataTable id="richDataTable"
                          
filterVar="#{richDataTableBean.attributes['filterVar']}"
                          
filteringListeners="#{richDataTableBean.attributes['filteringListeners']}"
                          
first="#{richDataTableBean.attributes['first']}"
@@ -85,7 +84,7 @@
                     <h:outputText value="Header Facet" />
                 </f:facet>
 
-                <it:column id="columnSex"
sortBy="#{record.sex}">
+                <rich:column id="columnSex"
sortBy="#{record.sex}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderSex"
value="Sex" />
                         <br/>
@@ -96,9 +95,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterSex"
value="Sex" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnName"
sortBy="#{record.name}">
+                <rich:column id="columnName"
sortBy="#{record.name}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderName"
value="Name" />
                         <br/>
@@ -109,9 +108,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterState"
value="Name" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnTitle"
sortBy="#{record.title}">
+                <rich:column id="columnTitle"
sortBy="#{record.title}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderTitle"
value="Title" />
                         <br/>
@@ -122,9 +121,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterTitle"
value="Title" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnBirthdate"
sortBy="#{record.birthdate}">
+                <rich:column id="columnBirthdate"
sortBy="#{record.birthdate}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderBirthdate"
value="Birthdate" />
                         <br/>
@@ -135,9 +134,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterBirthdate"
value="Birthdate" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnCompanies"
sortBy="#{record.companies}">
+                <rich:column id="columnCompanies"
sortBy="#{record.companies}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderCompanies"
value="Companies" />
                         <br/>
@@ -154,9 +153,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterSmoker"
value="Smoker" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnNumberOfKids"
sortBy="#{record.numberOfKids}">
+                <rich:column id="columnNumberOfKids"
sortBy="#{record.numberOfKids}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderNumberOfKids"
value="Number of Kids" />
                         <br/>
@@ -167,13 +166,13 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterNumberOfKids"
value="Number of Kids" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
                 <f:facet name="footer">
-                    <it:dataScroller id="scroller2"
for="richDataTable" page="#{richDataTableBean.page}"
maxPages="7" render="richDataTable" />
+                    <rich:dataScroller id="scroller2"
for="richDataTable" page="#{richDataTableBean.page}"
maxPages="7" render="richDataTable" />
                 </f:facet>
 
-            </it:dataTable>
+            </rich:dataTable>
         </ui:define>
 
         <ui:define name="outOfTemplateAfter">

Modified:
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml
===================================================================
---
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml	2010-07-10
19:22:14 UTC (rev 17842)
+++
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml	2010-07-10
19:22:56 UTC (rev 17843)
@@ -23,8 +23,7 @@
 <!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"
-      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:it="http://richfaces.org/iteration"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:rich="http://richfaces.org/rich">
 
     <ui:composition template="/templates/template.xhtml">
 
@@ -44,34 +43,34 @@
                 <a4j:ajax render="richDataTable scroller1"/>
             </h:selectBooleanCheckbox>
             <br/><br/>
-            <it:dataScroller id="scroller1" for="richDataTable"
page="#{richDataTableBean.page}" maxPages="7"
render="richDataTable"/>
+            <rich:dataScroller id="scroller1" for="richDataTable"
page="#{richDataTableBean.page}" maxPages="7"
render="richDataTable"/>
         </ui:define>
 
         <ui:define name="component">
 
-            <it:dataTable id="richDataTable"
-                         
filterVar="#{richDataTableBean.attributes['filterVar']}"
-                         
filteringListeners="#{richDataTableBean.attributes['filteringListeners']}"
-                         
first="#{richDataTableBean.attributes['first']}"
-                         
iterationState="#{richDataTableBean.attributes['iterationState']}"
-                         
iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}"
-                         
keepSaved="#{richDataTableBean.attributes['keepSaved']}"
-                         
noDataLabel="#{richDataTableBean.attributes['noDataLabel']}"
-                         
relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}"
-                         
rendered="#{richDataTableBean.attributes['rendered']}"
-                         
rowAvailable="#{richDataTableBean.attributes['rowAvailable']}"
-                         
rowCount="#{richDataTableBean.attributes['rowCount']}"
-                         
rowData="#{richDataTableBean.attributes['rowData']}"
-                         
rowIndex="#{richDataTableBean.attributes['rowIndex']}"
-                         
rowKey="#{richDataTableBean.attributes['rowKey']}"
-                         
rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}"
-                         
rows="#{richDataTableBean.attributes['rows']}"
-                         
sortMode="#{richDataTableBean.attributes['sortMode']}"
-                         
sortPriority="#{richDataTableBean.attributes['sortPriority']}"
-                         
sortingListeners="#{richDataTableBean.attributes['sortingListeners']}"
-                          value="#{richDataTableBean.state ? model.capitals :
null}"
-                          var="record"
-                          >
+            <rich:dataTable id="richDataTable"
+                           
filterVar="#{richDataTableBean.attributes['filterVar']}"
+                           
filteringListeners="#{richDataTableBean.attributes['filteringListeners']}"
+                           
first="#{richDataTableBean.attributes['first']}"
+                           
iterationState="#{richDataTableBean.attributes['iterationState']}"
+                           
iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}"
+                           
keepSaved="#{richDataTableBean.attributes['keepSaved']}"
+                           
noDataLabel="#{richDataTableBean.attributes['noDataLabel']}"
+                           
relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}"
+                           
rendered="#{richDataTableBean.attributes['rendered']}"
+                           
rowAvailable="#{richDataTableBean.attributes['rowAvailable']}"
+                           
rowCount="#{richDataTableBean.attributes['rowCount']}"
+                           
rowData="#{richDataTableBean.attributes['rowData']}"
+                           
rowIndex="#{richDataTableBean.attributes['rowIndex']}"
+                           
rowKey="#{richDataTableBean.attributes['rowKey']}"
+                           
rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}"
+                           
rows="#{richDataTableBean.attributes['rows']}"
+                           
sortMode="#{richDataTableBean.attributes['sortMode']}"
+                           
sortPriority="#{richDataTableBean.attributes['sortPriority']}"
+                           
sortingListeners="#{richDataTableBean.attributes['sortingListeners']}"
+                            value="#{richDataTableBean.state ? model.capitals :
null}"
+                            var="record"
+                            >
 
                 <f:facet name="noData">
                     <h:outputText value="There is no data."
style="color: red;"/>
@@ -85,7 +84,7 @@
                     <h:outputText value="Header Facet" />
                 </f:facet>
 
-                <it:column id="columnState"
sortBy="#{record.state}">
+                <rich:column id="columnState" 
sortBy="#{record.state}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderState"
value="State" />
                     </f:facet>
@@ -94,9 +93,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterState"
value="State" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnCapital"
sortBy="#{record.name}">
+                <rich:column id="columnCapital" 
sortBy="#{record.name}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderCapital"
value="Capital" />
                     </f:facet>
@@ -105,13 +104,13 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterCapital"
value="Capital" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
                 <f:facet name="footer">
-                    <it:dataScroller id="scroller2"
for="richDataTable" page="#{richDataTableBean.page}"
maxPages="7" render="richDataTable" />
+                    <rich:dataScroller id="scroller2"
for="richDataTable" page="#{richDataTableBean.page}"
maxPages="7" render="richDataTable" />
                 </f:facet>
 
-            </it:dataTable>
+            </rich:dataTable>
         </ui:define>
 
         <ui:define name="outOfTemplateAfter">
@@ -125,51 +124,56 @@
                 </rich:componentControl>
             </h:commandButton>
 
-            <br/>
+            <br/><br/>
 
-            scroller1:
-            <h:commandButton value="&lt;&lt; first">
-                <rich:componentControl event="click"
target="#{rich:clientId('scroller1')}"
operation="switchToPage">
-                    <f:param value="first" />
-                </rich:componentControl>
-            </h:commandButton>
+            <fieldset>
+                <legend>scroller1</legend>
 
-            <h:commandButton value="&lt; previous">
-                <rich:componentControl event="click"
target="#{rich:clientId('scroller1')}" operation="previous"
/>
-            </h:commandButton>
+                <h:commandButton value="&lt;&lt; first">
+                    <rich:componentControl event="click"
target="#{rich:clientId('scroller1')}"
operation="switchToPage">
+                        <f:param value="first" />
+                    </rich:componentControl>
+                </h:commandButton>
 
-            <h:commandButton value="next &gt;">
-                <rich:componentControl event="click"
target="#{rich:clientId('scroller1')}" operation="next" />
-            </h:commandButton>
+                <h:commandButton value="&lt; previous">
+                    <rich:componentControl event="click"
target="#{rich:clientId('scroller1')}" operation="previous"
/>
+                </h:commandButton>
 
-            <h:commandButton value="last &gt;&gt;">
-                <rich:componentControl event="click"
target="#{rich:clientId('scroller1')}"
operation="switchToPage">
-                    <f:param value="last" />
-                </rich:componentControl>
-            </h:commandButton>
+                <h:commandButton value="next &gt;">
+                    <rich:componentControl event="click"
target="#{rich:clientId('scroller1')}" operation="next" />
+                </h:commandButton>
 
+                <h:commandButton value="last &gt;&gt;">
+                    <rich:componentControl event="click"
target="#{rich:clientId('scroller1')}"
operation="switchToPage">
+                        <f:param value="last" />
+                    </rich:componentControl>
+                </h:commandButton>
+            </fieldset>
+
             <br/>
 
-            scroller2:
-            <h:commandButton value="&lt;&lt; first">
-                <rich:componentControl event="click"
target="#{rich:clientId('scroller2')}"
operation="switchToPage">
-                    <f:param value="first" />
-                </rich:componentControl>
-            </h:commandButton>
+            <fieldset>
+                <legend>scroller2</legend>
+                <h:commandButton value="&lt;&lt; first">
+                    <rich:componentControl event="click"
target="#{rich:clientId('scroller2')}"
operation="switchToPage">
+                        <f:param value="first" />
+                    </rich:componentControl>
+                </h:commandButton>
 
-            <h:commandButton value="&lt; previous">
-                <rich:componentControl event="click"
target="#{rich:clientId('scroller2')}" operation="previous"
/>
-            </h:commandButton>
+                <h:commandButton value="&lt; previous">
+                    <rich:componentControl event="click"
target="#{rich:clientId('scroller2')}" operation="previous"
/>
+                </h:commandButton>
 
-            <h:commandButton value="next &gt;">
-                <rich:componentControl event="click"
target="#{rich:clientId('scroller2')}" operation="next" />
-            </h:commandButton>
+                <h:commandButton value="next &gt;">
+                    <rich:componentControl event="click"
target="#{rich:clientId('scroller2')}" operation="next" />
+                </h:commandButton>
 
-            <h:commandButton value="last &gt;&gt;">
-                <rich:componentControl event="click"
target="#{rich:clientId('scroller2')}"
operation="switchToPage">
-                    <f:param value="last" />
-                </rich:componentControl>
-            </h:commandButton>
+                <h:commandButton value="last &gt;&gt;">
+                    <rich:componentControl event="click"
target="#{rich:clientId('scroller2')}"
operation="switchToPage">
+                        <f:param value="last" />
+                    </rich:componentControl>
+                </h:commandButton>
+            </fieldset>
 
             <br/><br/>
 

Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml
===================================================================
---
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml	2010-07-10
19:22:14 UTC (rev 17842)
+++
root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml	2010-07-10
19:22:56 UTC (rev 17843)
@@ -23,8 +23,7 @@
 <!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"
-      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:it="http://richfaces.org/iteration"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:rich="http://richfaces.org/rich">
 
     <ui:composition template="/templates/template.xhtml">
 
@@ -48,7 +47,7 @@
 
         <ui:define name="component">
 
-            <it:dataTable id="richDataTable"
+            <rich:dataTable id="richDataTable"
                          
filterVar="#{richDataTableBean.attributes['filterVar']}"
                          
filteringListeners="#{richDataTableBean.attributes['filteringListeners']}"
                          
first="#{richDataTableBean.attributes['first']}"
@@ -84,7 +83,7 @@
                     <h:outputText value="Header Facet" />
                 </f:facet>
 
-                <it:column id="columnState"
sortBy="#{record.state}">
+                <rich:column id="columnState"
sortBy="#{record.state}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderState"
value="State Header" />
                     </f:facet>
@@ -93,9 +92,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterState"
value="State Footer" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnCapital"
sortBy="#{record.name}">
+                <rich:column id="columnCapital"
sortBy="#{record.name}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderCapital"
value="Capital Header" />
                     </f:facet>
@@ -104,9 +103,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterCapital"
value="Capital Footer" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-            </it:dataTable>
+            </rich:dataTable>
         </ui:define>
 
         <ui:define name="outOfTemplateAfter">

Modified:
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml
===================================================================
---
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml	2010-07-10
19:22:14 UTC (rev 17842)
+++
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml	2010-07-10
19:22:56 UTC (rev 17843)
@@ -23,8 +23,7 @@
 <!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"
-      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:it="http://richfaces.org/iteration"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:rich="http://richfaces.org/rich">
 
     <ui:composition template="/templates/template.xhtml">
 
@@ -44,34 +43,34 @@
                 <a4j:ajax render="richEDT scroller1"/>
             </h:selectBooleanCheckbox>
             <br/><br/>
-            <it:dataScroller id="scroller1" for="richEDT"
page="#{richExtendedDataTableBean.page}" maxPages="7"
render="richEDT"/>
+            <rich:dataScroller id="scroller1" for="richEDT"
page="#{richExtendedDataTableBean.page}" maxPages="7"
render="richEDT"/>
         </ui:define>
 
         <ui:define name="component">
 
-            <it:dataTable id="richEDT"
-                         
filterVar="#{richExtendedDataTableBean.attributes['filterVar']}"
-                         
filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}"
-                         
first="#{richExtendedDataTableBean.attributes['first']}"
-                         
iterationState="#{richExtendedDataTableBean.attributes['iterationState']}"
-                         
iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}"
-                         
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}"
-                         
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}"
-                         
relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}"
-                         
rendered="#{richExtendedDataTableBean.attributes['rendered']}"
-                         
rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}"
-                         
rowCount="#{richExtendedDataTableBean.attributes['rowCount']}"
-                         
rowData="#{richExtendedDataTableBean.attributes['rowData']}"
-                         
rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}"
-                         
rowKey="#{richExtendedDataTableBean.attributes['rowKey']}"
-                         
rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}"
-                         
rows="#{richExtendedDataTableBean.attributes['rows']}"
-                         
sortMode="#{richExtendedDataTableBean.attributes['sortMode']}"
-                         
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}"
-                         
sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}"
-                          value="#{richExtendedDataTableBean.state ? model.employees
: null}"
-                          var="record"
-                          >
+            <rich:extendedDataTable id="richEDT"
+                                   
filterVar="#{richExtendedDataTableBean.attributes['filterVar']}"
+                                   
filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}"
+                                   
first="#{richExtendedDataTableBean.attributes['first']}"
+                                   
iterationState="#{richExtendedDataTableBean.attributes['iterationState']}"
+                                   
iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}"
+                                   
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}"
+                                   
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}"
+                                   
relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}"
+                                   
rendered="#{richExtendedDataTableBean.attributes['rendered']}"
+                                   
rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}"
+                                   
rowCount="#{richExtendedDataTableBean.attributes['rowCount']}"
+                                   
rowData="#{richExtendedDataTableBean.attributes['rowData']}"
+                                   
rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}"
+                                   
rowKey="#{richExtendedDataTableBean.attributes['rowKey']}"
+                                   
rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}"
+                                   
rows="#{richExtendedDataTableBean.attributes['rows']}"
+                                   
sortMode="#{richExtendedDataTableBean.attributes['sortMode']}"
+                                   
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}"
+                                   
sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}"
+                                    value="#{richExtendedDataTableBean.state ?
model.employees : null}"
+                                    var="record"
+                                    >
 
                 <f:facet name="noData">
                     <h:outputText value="There is no data."
style="color: red;"/>
@@ -85,7 +84,7 @@
                     <h:outputText value="Header Facet" />
                 </f:facet>
 
-                <it:column id="columnSex"
sortBy="#{record.sex}">
+                <rich:column id="columnSex"
sortBy="#{record.sex}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderSex"
value="Sex" />
                         <br/>
@@ -97,9 +96,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterSex"
value="Sex" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnName"
sortBy="#{record.name}">
+                <rich:column id="columnName"
sortBy="#{record.name}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderName"
value="Name" />
                         <br/>
@@ -110,9 +109,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterState"
value="Name" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnTitle"
sortBy="#{record.title}">
+                <rich:column id="columnTitle"
sortBy="#{record.title}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderTitle"
value="Title" />
                         <br/>
@@ -123,9 +122,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterTitle"
value="Title" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnSmoker"
sortBy="#{record.smoker}">
+                <rich:column id="columnSmoker"
sortBy="#{record.smoker}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderSmoker"
value="Smoker" />
                         <br/>
@@ -137,9 +136,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterSmoker"
value="Smoker" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnFavoriteColor"
sortBy="#{record.favoriteColor}">
+                <rich:column id="columnFavoriteColor"
sortBy="#{record.favoriteColor}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderFavoriteColor"
value="Favorite Color" />
                         <br/>
@@ -150,9 +149,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterFavoriteColor"
value="Favorite Color" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnNumberOfKids"
sortBy="#{record.numberOfKids}">
+                <rich:column id="columnNumberOfKids"
sortBy="#{record.numberOfKids}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderNumberOfKids"
value="Number of Kids" />
                         <br/>
@@ -163,13 +162,13 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterNumberOfKids"
value="Number of Kids" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
                 <f:facet name="footer">
-                    <it:dataScroller id="scroller2" for="richEDT"
page="#{richExtendedDataTableBean.page}" maxPages="7"
render="richEDT" />
+                    <rich:dataScroller id="scroller2"
for="richEDT" page="#{richExtendedDataTableBean.page}"
maxPages="7" render="richEDT" />
                 </f:facet>
 
-            </it:dataTable>
+            </rich:extendedDataTable>
         </ui:define>
 
         <ui:define name="outOfTemplateAfter">

Modified:
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml
===================================================================
---
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml	2010-07-10
19:22:14 UTC (rev 17842)
+++
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml	2010-07-10
19:22:56 UTC (rev 17843)
@@ -23,8 +23,7 @@
 <!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"
-      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:it="http://richfaces.org/iteration"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:rich="http://richfaces.org/rich">
 
     <ui:composition template="/templates/template.xhtml">
 
@@ -44,34 +43,34 @@
                 <a4j:ajax render="richEDT scroller1"/>
             </h:selectBooleanCheckbox>
             <br/><br/>
-            <it:dataScroller id="scroller1" for="richEDT"
page="#{richExtendedDataTableBean.page}" maxPages="7"
render="richEDT"/>
+            <rich:dataScroller id="scroller1" for="richEDT"
page="#{richExtendedDataTableBean.page}" maxPages="7"
render="richEDT"/>
         </ui:define>
 
         <ui:define name="component">
 
-            <it:dataTable id="richEDT"
-                         
filterVar="#{richExtendedDataTableBean.attributes['filterVar']}"
-                         
filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}"
-                         
first="#{richExtendedDataTableBean.attributes['first']}"
-                         
iterationState="#{richExtendedDataTableBean.attributes['iterationState']}"
-                         
iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}"
-                         
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}"
-                         
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}"
-                         
relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}"
-                         
rendered="#{richExtendedDataTableBean.attributes['rendered']}"
-                         
rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}"
-                         
rowCount="#{richExtendedDataTableBean.attributes['rowCount']}"
-                         
rowData="#{richExtendedDataTableBean.attributes['rowData']}"
-                         
rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}"
-                         
rowKey="#{richExtendedDataTableBean.attributes['rowKey']}"
-                         
rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}"
-                         
rows="#{richExtendedDataTableBean.attributes['rows']}"
-                         
sortMode="#{richExtendedDataTableBean.attributes['sortMode']}"
-                         
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}"
-                         
sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}"
-                          value="#{richExtendedDataTableBean.state ? model.employees
: null}"
-                          var="record"
-                          >
+            <rich:extendedDataTable id="richEDT"
+                                   
filterVar="#{richExtendedDataTableBean.attributes['filterVar']}"
+                                   
filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}"
+                                   
first="#{richExtendedDataTableBean.attributes['first']}"
+                                   
iterationState="#{richExtendedDataTableBean.attributes['iterationState']}"
+                                   
iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}"
+                                   
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}"
+                                   
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}"
+                                   
relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}"
+                                   
rendered="#{richExtendedDataTableBean.attributes['rendered']}"
+                                   
rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}"
+                                   
rowCount="#{richExtendedDataTableBean.attributes['rowCount']}"
+                                   
rowData="#{richExtendedDataTableBean.attributes['rowData']}"
+                                   
rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}"
+                                   
rowKey="#{richExtendedDataTableBean.attributes['rowKey']}"
+                                   
rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}"
+                                   
rows="#{richExtendedDataTableBean.attributes['rows']}"
+                                   
sortMode="#{richExtendedDataTableBean.attributes['sortMode']}"
+                                   
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}"
+                                   
sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}"
+                                    value="#{richExtendedDataTableBean.state ?
model.employees : null}"
+                                    var="record"
+                                    >
 
                 <f:facet name="noData">
                     <h:outputText value="There is no data."
style="color: red;"/>
@@ -85,7 +84,7 @@
                     <h:outputText value="Header Facet" />
                 </f:facet>
 
-                <it:column id="columnSex"
sortBy="#{record.sex}">
+                <rich:column id="columnSex"
sortBy="#{record.sex}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderSex"
value="Sex" />
                         <br/>
@@ -96,9 +95,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterSex"
value="Sex" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnName"
sortBy="#{record.name}">
+                <rich:column id="columnName"
sortBy="#{record.name}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderName"
value="Name" />
                         <br/>
@@ -109,9 +108,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterState"
value="Name" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnTitle"
sortBy="#{record.title}">
+                <rich:column id="columnTitle"
sortBy="#{record.title}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderTitle"
value="Title" />
                         <br/>
@@ -122,9 +121,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterTitle"
value="Title" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnBirthdate"
sortBy="#{record.birthdate}">
+                <rich:column id="columnBirthdate"
sortBy="#{record.birthdate}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderBirthdate"
value="Birthdate" />
                         <br/>
@@ -135,9 +134,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterBirthdate"
value="Birthdate" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnCompanies"
sortBy="#{record.companies}">
+                <rich:column id="columnCompanies"
sortBy="#{record.companies}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderCompanies"
value="Companies" />
                         <br/>
@@ -154,9 +153,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterSmoker"
value="Smoker" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnNumberOfKids"
sortBy="#{record.numberOfKids}">
+                <rich:column id="columnNumberOfKids"
sortBy="#{record.numberOfKids}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderNumberOfKids"
value="Number of Kids" />
                         <br/>
@@ -167,13 +166,13 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterNumberOfKids"
value="Number of Kids" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
                 <f:facet name="footer">
-                    <it:dataScroller id="scroller2" for="richEDT"
page="#{richExtendedDataTableBean.page}" maxPages="7"
render="richEDT" />
+                    <rich:dataScroller id="scroller2"
for="richEDT" page="#{richExtendedDataTableBean.page}"
maxPages="7" render="richEDT" />
                 </f:facet>
 
-            </it:dataTable>
+            </rich:extendedDataTable>
         </ui:define>
 
         <ui:define name="outOfTemplateAfter">

Modified:
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
===================================================================
---
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml	2010-07-10
19:22:14 UTC (rev 17842)
+++
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml	2010-07-10
19:22:56 UTC (rev 17843)
@@ -23,8 +23,7 @@
 <!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"
-      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:it="http://richfaces.org/iteration"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:rich="http://richfaces.org/rich">
 
     <ui:composition template="/templates/template.xhtml">
 
@@ -44,34 +43,34 @@
                 <a4j:ajax render="richEDT scroller1"/>
             </h:selectBooleanCheckbox>
             <br/><br/>
-            <it:dataScroller id="scroller1" for="richEDT"
page="#{richExtendedDataTableBean.page}" maxPages="7"
render="richEDT"/>
+            <rich:dataScroller id="scroller1" for="richEDT"
page="#{richExtendedDataTableBean.page}" maxPages="7"
render="richEDT"/>
         </ui:define>
 
         <ui:define name="component">
 
-            <it:dataTable id="richEDT"
-                         
filterVar="#{richExtendedDataTableBean.attributes['filterVar']}"
-                         
filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}"
-                         
first="#{richExtendedDataTableBean.attributes['first']}"
-                         
iterationState="#{richExtendedDataTableBean.attributes['iterationState']}"
-                         
iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}"
-                         
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}"
-                         
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}"
-                         
relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}"
-                         
rendered="#{richExtendedDataTableBean.attributes['rendered']}"
-                         
rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}"
-                         
rowCount="#{richExtendedDataTableBean.attributes['rowCount']}"
-                         
rowData="#{richExtendedDataTableBean.attributes['rowData']}"
-                         
rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}"
-                         
rowKey="#{richExtendedDataTableBean.attributes['rowKey']}"
-                         
rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}"
-                         
rows="#{richExtendedDataTableBean.attributes['rows']}"
-                         
sortMode="#{richExtendedDataTableBean.attributes['sortMode']}"
-                         
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}"
-                         
sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}"
-                          value="#{richExtendedDataTableBean.state ? model.capitals
: null}"
-                          var="record"
-                          >
+            <rich:extendedDataTable id="richEDT"
+                           
filterVar="#{richExtendedDataTableBean.attributes['filterVar']}"
+                           
filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}"
+                           
first="#{richExtendedDataTableBean.attributes['first']}"
+                           
iterationState="#{richExtendedDataTableBean.attributes['iterationState']}"
+                           
iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}"
+                           
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}"
+                           
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}"
+                           
relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}"
+                           
rendered="#{richExtendedDataTableBean.attributes['rendered']}"
+                           
rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}"
+                           
rowCount="#{richExtendedDataTableBean.attributes['rowCount']}"
+                           
rowData="#{richExtendedDataTableBean.attributes['rowData']}"
+                           
rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}"
+                           
rowKey="#{richExtendedDataTableBean.attributes['rowKey']}"
+                           
rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}"
+                           
rows="#{richExtendedDataTableBean.attributes['rows']}"
+                           
sortMode="#{richExtendedDataTableBean.attributes['sortMode']}"
+                           
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}"
+                           
sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}"
+                            value="#{richExtendedDataTableBean.state ?
model.capitals : null}"
+                            var="record"
+                            >
 
                 <f:facet name="noData">
                     <h:outputText value="There is no data."
style="color: red;"/>
@@ -85,7 +84,7 @@
                     <h:outputText value="Header Facet" />
                 </f:facet>
 
-                <it:column id="columnState"
sortBy="#{record.state}">
+                <rich:column id="columnState"
sortBy="#{record.state}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderState"
value="State" />
                     </f:facet>
@@ -94,9 +93,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterState"
value="State" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnCapital"
sortBy="#{record.name}">
+                <rich:column id="columnCapital"
sortBy="#{record.name}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderCapital"
value="Capital" />
                     </f:facet>
@@ -105,13 +104,13 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterCapital"
value="Capital" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
                 <f:facet name="footer">
-                    <it:dataScroller id="scroller2" for="richEDT"
page="#{richExtendedDataTableBean.page}" maxPages="7"
render="richEDT" />
+                    <rich:dataScroller id="scroller2"
for="richEDT" page="#{richExtendedDataTableBean.page}"
maxPages="7" render="richEDT" />
                 </f:facet>
 
-            </it:dataTable>
+            </rich:extendedDataTable>
         </ui:define>
 
         <ui:define name="outOfTemplateAfter">

Modified:
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml
===================================================================
---
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml	2010-07-10
19:22:14 UTC (rev 17842)
+++
root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml	2010-07-10
19:22:56 UTC (rev 17843)
@@ -23,8 +23,7 @@
 <!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"
-      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:it="http://richfaces.org/iteration"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:ta="http://java.sun.com/jsf/composite/testapp"
xmlns:rich="http://richfaces.org/rich">
 
     <ui:composition template="/templates/template.xhtml">
 
@@ -48,36 +47,34 @@
 
         <ui:define name="component">
 
-            <it:extendedDataTable id="richEDT"
-                                 
clientFirst="#{richExtendedDataTableBean.attributes['clientFirst']}"
-                                 
clientRows="#{richExtendedDataTableBean.attributes['clientRows']}"
-                                 
filterVar="#{richExtendedDataTableBean.attributes['filterVar']}"
-                                 
filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}"
-                                 
first="#{richExtendedDataTableBean.attributes['first']}"
-                                 
iterationState="#{richExtendedDataTableBean.attributes['iterationState']}"
-                                 
iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}"
-                                 
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}"
-                                 
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}"
-                                 
relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}"
-                                 
rendered="#{richExtendedDataTableBean.attributes['rendered']}"
-                                 
rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}"
-                                 
rowCount="#{richExtendedDataTableBean.attributes['rowCount']}"
-                                 
rowData="#{richExtendedDataTableBean.attributes['rowData']}"
-                                 
rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}"
-                                 
rowKey="#{richExtendedDataTableBean.attributes['rowKey']}"
-                                 
rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}"
-                                 
rows="#{richExtendedDataTableBean.attributes['rows']}"
-                                 
sortMode="#{richExtendedDataTableBean.attributes['sortMode']}"
-                                 
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}"
-                                 
sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}"
-                                 
style="#{richExtendedDataTableBean.attributes['style']}"
-                                 
styleClass="#{richExtendedDataTableBean.attributes['styleClass']}"
-                                  value="#{richExtendedDataTableBean.state ?
model.capitals : null}"
-                                  var="record"
+            <rich:extendedDataTable id="richEDT"
+                                   
clientFirst="#{richExtendedDataTableBean.attributes['clientFirst']}"
+                                   
clientRows="#{richExtendedDataTableBean.attributes['clientRows']}"
+                                   
filterVar="#{richExtendedDataTableBean.attributes['filterVar']}"
+                                   
filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}"
+                                   
first="#{richExtendedDataTableBean.attributes['first']}"
+                                   
iterationState="#{richExtendedDataTableBean.attributes['iterationState']}"
+                                   
iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}"
+                                   
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}"
+                                   
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}"
+                                   
relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}"
+                                   
rendered="#{richExtendedDataTableBean.attributes['rendered']}"
+                                   
rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}"
+                                   
rowCount="#{richExtendedDataTableBean.attributes['rowCount']}"
+                                   
rowData="#{richExtendedDataTableBean.attributes['rowData']}"
+                                   
rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}"
+                                   
rowKey="#{richExtendedDataTableBean.attributes['rowKey']}"
+                                   
rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}"
+                                   
rows="#{richExtendedDataTableBean.attributes['rows']}"
+                                   
sortMode="#{richExtendedDataTableBean.attributes['sortMode']}"
+                                   
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}"
+                                   
sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}"
+                                   
style="#{richExtendedDataTableBean.attributes['style']}"
+                                   
styleClass="#{richExtendedDataTableBean.attributes['styleClass']}"
+                                    value="#{richExtendedDataTableBean.state ?
model.capitals : null}"
+                                    var="record"
+                                    >
 
-
-                                  >
-
                 <f:facet name="noData">
                     <h:outputText value="There is no data."
style="color: red;"/>
                 </f:facet>
@@ -90,7 +87,7 @@
                     <h:outputText value="Header Facet" />
                 </f:facet>
 
-                <it:column id="columnState"
sortBy="#{record.state}">
+                <rich:column id="columnState"
sortBy="#{record.state}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderState"
value="State Header" />
                     </f:facet>
@@ -99,9 +96,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterState"
value="State Footer" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-                <it:column id="columnCapital"
sortBy="#{record.name}">
+                <rich:column id="columnCapital"
sortBy="#{record.name}">
                     <f:facet name="header">
                         <h:outputText id="columnHeaderCapital"
value="Capital Header" />
                     </f:facet>
@@ -110,9 +107,9 @@
                     <f:facet name="footer">
                         <h:outputText id="columnFooterCapital"
value="Capital Footer" />
                     </f:facet>
-                </it:column>
+                </rich:column>
 
-            </it:extendedDataTable>
+            </rich:extendedDataTable>
         </ui:define>
 
         <ui:define name="outOfTemplateAfter">

Modified: root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml
===================================================================
--- root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml	2010-07-10 19:22:14
UTC (rev 17842)
+++ root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml	2010-07-10 19:22:56
UTC (rev 17843)
@@ -5,9 +5,9 @@
     <h:panelGrid id="headerTable" columns="6" border="1"
styleClass="external-table" columnClasses="header-column, header-column,
header-column, header-column, header-column, header-column">
 
         <h:panelGrid columns="3">
-            <h:link outcome="/index"><h:graphicImage
library="images" name="home.png" title="Go Home"
style="width: 48px;"/></h:link>
-            <h:link outcome="list"><h:graphicImage
library="images" name="back.png" title="Go to List of Pages"
style="width: 48px;"/></h:link>
-            <h:graphicImage library="images" name="refresh.png"
title="Rerender All" style="width: 48px;">
+            <h:link outcome="/index"><h:graphicImage
library="images" name="home.png" title="Go Home"
style="width: 36px;"/></h:link>
+            <h:link outcome="list"><h:graphicImage
library="images" name="back.png" title="Go to List of Pages"
style="width: 36px;"/></h:link>
+            <h:graphicImage library="images" name="refresh.png"
title="Rerender All" style="width: 36px;">
                 <a4j:ajax event="click" render="commondGrid"/>
             </h:graphicImage>
         </h:panelGrid>
@@ -65,7 +65,7 @@
         </h:panelGrid>
 
         <h:panelGrid columns="1">
-            <h:commandButton action="#{richBean.invalidateSession}"
value="Invalidate Session"
image="#{resource['images:cancel.png']}" style="width:
48px;"/>
+            <h:commandButton action="#{richBean.invalidateSession}"
value="Invalidate Session"
image="#{resource['images:cancel.png']}" style="width:
36px;"/>
         </h:panelGrid>
     </h:panelGrid>
 


    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[richfaces-svn-commits] JBoss Rich Faces SVN: r17843 - in root/tests/metamer/trunk: src/main/webapp/components/richDataScroller and 3 other directories.