Author: nbelaevski Date: 2010-06-02 11:44:40 -0400 (Wed, 02 Jun 2010) New Revision: 17466 Modified: root/examples/richfaces-showcase/trunk/pom.xml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/functions/functions.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/queue/queue.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/repeat/simpleGrid.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml Log: richfaces-showcase switched to richfaces-components-bom Modified: root/examples/richfaces-showcase/trunk/pom.xml =================================================================== --- root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 15:44:40 UTC (rev 17466) @@ -30,20 +30,12 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core-bom</artifactId> + <artifactId>richfaces-components-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-misc-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <!-- simple logger binding: only messages of level INFO and higher are printed--> <dependency> <groupId>org.slf4j</groupId> @@ -63,32 +55,9 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core-ui</artifactId> + <artifactId>richfaces-components-ui</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-iteration-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-misc-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.2</version> - </dependency> - - <dependency> <groupId>${jsf2.api.groupid}</groupId> <artifactId>${jsf2.api.artifactid}</artifactId> </dependency> @@ -172,6 +141,19 @@ </build> <profiles> + <profile> + <id>jdk5</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2</version> + </dependency> + </dependencies> + </profile> <profile> <id>release</id> <build> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,10 +4,9 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:it="http://richfaces.org/iteration" + xmlns:rich="http://richfaces.org/rich" xmlns:fn="http://java.sun.com/jsp/jstl/functions" - xmlns:rich="http://java.sun.com/jsf/composite/rich" - xmlns:rfn="http://richfaces.org/misc"> + xmlns:r="http://java.sun.com/jsf/composite/rich"> <ui:composition> <style> @@ -19,7 +18,7 @@ <p>Currently target component should be defined by using clientId, but we planning to add lookup by short id in nearest versions.</p> <h:form id="form"> <h:panelGrid columns="2" columnClasses="atop"> - <rich:panel> + <r:panel> <f:facet name="header"> <h:outputText value="Quick Filter Panel" /> </f:facet> @@ -27,19 +26,19 @@ <ul> <a4j:repeat value="#{carsBean.allVendors}" var="vendor"> <li><h:outputLink value="#">#{vendor} - <rfn:componentControl target="table" operation="filter" event="click"> + <rich:componentControl target="table" operation="filter" event="click"> <f:param value="vendor"/> <f:param value="#{vendor}"/> - </rfn:componentControl> + </rich:componentControl> </h:outputLink> </li> </a4j:repeat> </ul> </fieldset> - </rich:panel> - <it:dataTable value="#{carsBean.allInventoryItems}" var="car" + </r:panel> + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" id="table" rows="20"> - <it:column id="vendor" filterValue="#{carsFilteringBean.vendorFilter}" + <rich:column id="vendor" filterValue="#{carsFilteringBean.vendorFilter}" filterExpression="#{carsFilteringBean.vendorFilter == '' or carsFilteringBean.vendorFilter == null or carsFilteringBean.vendorFilter == car.vendor}"> <f:facet name="header"> <h:panelGroup> @@ -47,47 +46,47 @@ </h:panelGroup> </f:facet> <h:outputText value="#{car.vendor}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Model" /> </f:facet> <h:outputText value="#{car.model}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Price" /> </f:facet> <h:outputText value="#{car.price}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:panelGroup> <h:outputText value="Mileage" /> </h:panelGroup> </f:facet> <h:outputText value="#{car.mileage}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:panelGroup> <h:outputText value="Days Live" /> </h:panelGroup> </f:facet> <h:outputText value="#{car.daysLive}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:panelGroup> <h:outputText value="VIN " /> </h:panelGroup> </f:facet> <h:outputText value="#{car.vin}" /> - </it:column> + </rich:column> <f:facet name="footer"> - <it:dataScroller/> + <rich:dataScroller/> </f:facet> - </it:dataTable> + </rich:dataTable> </h:panelGrid> </h:form> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,8 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:it="http://richfaces.org/iteration" - xmlns:fn="http://richfaces.org/misc"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition> <style> @@ -26,15 +25,15 @@ <h:panelGrid columns="1" rowClasses="calign"> <h:panelGrid columns="3" id="repeat"> <h:graphicImage value="/images/icons/scroller/arr_left.png" - onclick="#{fn:component('ds')}.previous()" /> + onclick="#{rich:component('ds')}.previous()" /> <a4j:repeat rows="3" value="#{slidesBean.pictures}" var="pic" id="pics"> <h:graphicImage value="#{pic.uri}" style="padding:5px;"/> </a4j:repeat> <h:graphicImage value="/images/icons/scroller/arr_right.png" - onclick="#{fn:component('ds')}.next()" /> + onclick="#{rich:component('ds')}.next()" /> </h:panelGrid> - <it:dataScroller for="pics" id="ds" render="repeat" stepControls="none" boundaryControls="none" fastControls="none" maxPages="10"/> + <rich:dataScroller for="pics" id="ds" render="repeat" stepControls="none" boundaryControls="none" fastControls="none" maxPages="10"/> </h:panelGrid> </h:form> </ui:composition> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,7 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:it="http://richfaces.org/iteration" + xmlns:rich="http://richfaces.org/rich" <ui:composition> @@ -12,41 +12,41 @@ <p>Starting from 4.x version - no more additional updated should be defined by end-developer in order to synchronize different dataScrollers attached to the same table as in example below.</p> <h:form id="form"> - <it:dataScroller for="table" maxPages="6"/> - <it:dataTable value="#{carsBean.allInventoryItems}" var="car" + <rich:dataScroller for="table" maxPages="6"/> + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" id="table" rows="10"> - <it:column accept="#{carsFiteringBean.acceptVendor}"> + <rich:column accept="#{carsFiteringBean.acceptVendor}"> <f:facet name="header"> <h:outputText value="Vendor " /> </f:facet> <h:outputText value="#{car.vendor}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Model" /> </f:facet> <h:outputText value="#{car.model}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Price" /> </f:facet> <h:outputText value="#{car.price}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Mileage" /> </f:facet> <h:outputText value="#{car.mileage}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="VIN " /> </f:facet> <h:outputText value="#{car.vin}" /> - </it:column> - </it:dataTable> - <it:dataScroller for="table" maxPages="6"/> + </rich:column> + </rich:dataTable> + <rich:dataScroller for="table" maxPages="6"/> </h:form> </ui:composition> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,47 +4,47 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:it="http://richfaces.org/iteration"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition> <p>This sample shows simple master-detail table implemented using<b> tbl:dataTable</b> and<b> tbl:subtable</b> components</p> - <it:dataTable width="700" var="record" + <rich:dataTable width="700" var="record" value="#{reportBean.expReport.records}"> <f:facet name="header"> - <it:columnGroup> - <it:column rowspan="2"> - </it:column> - <it:column colspan="3"> + <rich:columnGroup> + <rich:column rowspan="2"> + </rich:column> + <rich:column colspan="3"> <h:outputText value="Expenses" /> - </it:column> - <it:column rowspan="2"> + </rich:column> + <rich:column rowspan="2"> <h:outputText value="subtotals" /> - </it:column> - <it:column breakRowBefore="true"> + </rich:column> + <rich:column breakRowBefore="true"> <h:outputText value="Meals" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="Hotels" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="Transport" /> - </it:column> - </it:columnGroup> + </rich:column> + </rich:columnGroup> </f:facet> - <it:column colspan="5"> + <rich:column colspan="5"> <h:outputText value="#{record.city}" /> - </it:column> + </rich:column> - <it:subTable var="expense" value="#{record.items}"> - <it:column> + <rich:subTable var="expense" value="#{record.items}"> + <rich:column> <h:outputText value="#{expense.day}"></h:outputText> <f:facet name="footer"> <div></div> </f:facet> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{expense.meals}"> <f:convertNumber pattern="$####.00" /> </h:outputText> @@ -53,8 +53,8 @@ <f:convertNumber pattern="$####.00" /> </h:outputText> </f:facet> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{expense.hotels}"> <f:convertNumber pattern="$####.00" /> </h:outputText> @@ -63,9 +63,9 @@ <f:convertNumber pattern="$####.00" /> </h:outputText> </f:facet> - </it:column> + </rich:column> - <it:column> + <rich:column> <h:outputText value="#{expense.transport}"> <f:convertNumber pattern="$####.00" /> </h:outputText> @@ -74,46 +74,46 @@ <f:convertNumber pattern="$####.00" /> </h:outputText> </f:facet> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="footer"> <h:outputText value="#{record.total}"> <f:convertNumber pattern="$####.00" /> </h:outputText> </f:facet> - </it:column> + </rich:column> - </it:subTable> + </rich:subTable> <f:facet name="footer"> - <it:columnGroup> - <it:column>Totals</it:column> - <it:column> + <rich:columnGroup> + <rich:column>Totals</rich:column> + <rich:column> <h:outputText value="#{reportBean.expReport.totalMeals}"> <f:convertNumber pattern="$####.00" /> </h:outputText> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{reportBean.expReport.totalHotels}"> <f:convertNumber pattern="$####.00" /> </h:outputText> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{reportBean.expReport.totalTransport}"> <f:convertNumber pattern="$####.00" /> </h:outputText> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{reportBean.expReport.grandTotal}"> <f:convertNumber pattern="$####.00" /> </h:outputText> - </it:column> - </it:columnGroup> + </rich:column> + </rich:columnGroup> </f:facet> - </it:dataTable> + </rich:dataTable> </ui:composition> </html> \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,19 +4,19 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:it="http://richfaces.org/iteration" + xmlns:rich="http://richfaces.org/rich" xmlns:fn="http://java.sun.com/jsp/jstl/functions" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> + xmlns:r="http://java.sun.com/jsf/composite/rich"> <ui:composition> <h:form id="form"> - <rich:messages/> - <it:dataTable value="#{carsBean.allInventoryItems}" var="car" + <r:messages/> + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" id="table" rows="30"> <f:facet name="noData"> Nothing found </f:facet> - <it:column filterValue="#{carsFilteringBean.vendorFilter}" filterExpression="#{fn:containsIgnoreCase(car.vendor, carsFilteringBean.vendorFilter)}"> + <rich:column filterValue="#{carsFilteringBean.vendorFilter}" filterExpression="#{fn:containsIgnoreCase(car.vendor, carsFilteringBean.vendorFilter)}"> <f:facet name="header"> <h:panelGroup> <h:outputText value="Vendor " /> @@ -27,20 +27,20 @@ </h:panelGroup> </f:facet> <h:outputText value="#{car.vendor}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Model" /> </f:facet> <h:outputText value="#{car.model}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Price" /> </f:facet> <h:outputText value="#{car.price}" /> - </it:column> - <it:column filter="#{carsFilteringBean.mileageFilterImpl}"> + </rich:column> + <rich:column filter="#{carsFilteringBean.mileageFilterImpl}"> <f:facet name="header"> <h:panelGroup> <h:outputText value="Mileage &lt; " /> @@ -52,8 +52,8 @@ </h:panelGroup> </f:facet> <h:outputText value="#{car.mileage}" /> - </it:column> - <it:column filterValue="#{carsFilteringBean.vinFilter}" + </rich:column> + <rich:column filterValue="#{carsFilteringBean.vinFilter}" filterExpression="#{fn:containsIgnoreCase(car.vin,carsFilteringBean.vinFilter)}"> <f:facet name="header"> <h:panelGroup> @@ -64,8 +64,8 @@ </h:panelGroup> </f:facet> <h:outputText value="#{car.vin}" /> - </it:column> - </it:dataTable> + </rich:column> + </rich:dataTable> </h:form> </ui:composition> </html> \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,8 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:it="http://richfaces.org/iteration" - xmlns:fn="http://richfaces.org/misc"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition> <p> @@ -15,36 +14,36 @@ <p>Currently you could only control sortOrder in your actions, and in near versions we're planning to add special sort controls</p> <p>Also you could use # {rich:component('tableId')}.sort('columnId', ['sortOrder']) JS api</p> <h:form> - <it:dataTable value="#{capitalsBean.capitals}" var="cap" id="table"> - <it:column> + <rich:dataTable value="#{capitalsBean.capitals}" var="cap" id="table"> + <rich:column> <f:facet name="header"> State Flag </f:facet> <h:graphicImage value="#{cap.stateFlag}" /> - </it:column> - <it:column sortBy="#{cap.name}" id="name" + </rich:column> + <rich:column sortBy="#{cap.name}" id="name" sortOrder="#{capitalsSortingBean.capitalsOrder}"> <f:facet name="header"> <a4j:commandLink value="Sort by Capital Name" render="table" action="#{capitalsSortingBean.sortByCapitals}"/> </f:facet> <h:outputText value="#{cap.name}" /> - </it:column> - <it:column sortBy="#{cap.state}" id="state" + </rich:column> + <rich:column sortBy="#{cap.state}" id="state" sortOrder="#{capitalsSortingBean.statesOrder}"> <f:facet name="header"> <a4j:commandLink value="Sort by State Name" render="table" action="#{capitalsSortingBean.sortByStates}"/> </f:facet> <h:outputText value="#{cap.state}" /> - </it:column> - <it:column sortBy="#{cap.timeZone}" id="timeZone" + </rich:column> + <rich:column sortBy="#{cap.timeZone}" id="timeZone" comparator="#{capitalsSortingBean.timeZoneComparator}" sortOrder="#{capitalsSortingBean.timeZonesOrder}"> <f:facet name="header"> <a4j:commandLink value="Sort by Time Zone" render="table" action="#{capitalsSortingBean.sortByTimeZones}"/> </f:facet> <h:outputText value="#{cap.timeZone}" /> - </it:column> - </it:dataTable> + </rich:column> + </rich:dataTable> </h:form> </ui:composition> </html> \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,7 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:it="http://richfaces.org/iteration" + xmlns:rich="http://richfaces.org/rich" xmlns:fn="http://java.sun.com/jsp/jstl/functions"> <ui:composition> @@ -25,40 +25,40 @@ <p>This sample shows simple table styling. The table appears in zebra-style and has highlighting of hovered row.</p> <h:form id="form"> - <it:dataTable value="#{carsBean.allInventoryItems}" var="car" + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" id="table" rows="20" rowClasses="odd-row, even-row" styleClass="stable"> - <it:column accept="#{carsFiteringBean.acceptVendor}"> + <rich:column accept="#{carsFiteringBean.acceptVendor}"> <f:facet name="header"> <h:outputText value="Vendor " /> </f:facet> <h:outputText value="#{car.vendor}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Model" /> </f:facet> <h:outputText value="#{car.model}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Price" /> </f:facet> <h:outputText value="#{car.price}" /> - </it:column> - <it:column filter="#{carsFilteringBean.mileageFilterImpl}"> + </rich:column> + <rich:column filter="#{carsFilteringBean.mileageFilterImpl}"> <f:facet name="header"> <h:outputText value="Mileage" /> </f:facet> <h:outputText value="#{car.mileage}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="VIN " /> </f:facet> <h:outputText value="#{car.vin}" /> - </it:column> - </it:dataTable> + </rich:column> + </rich:dataTable> </h:form> <script> $('.stable tr').mouseover(function(){$(this).addClass('active-row')}); Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,7 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:it="http://richfaces.org/iteration"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition> <p>ExtendedDataTable component provides next set of features:</p> @@ -15,54 +15,54 @@ </ul> <h:form> - <it:extendedDataTable value="#{carsBean.allInventoryItems}" var="car" + <rich:extendedDataTable value="#{carsBean.allInventoryItems}" var="car" id="table" frozenColumns="2" style="height:300px; width:500px;"> <f:facet name="header"> <h:outputText value="Cars marketplace" /> </f:facet> - <it:column> + <rich:column> <f:facet name="header"> <h:outputText value="vendor" /> </f:facet> <h:outputText value="#{car.vendor}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Model" /> </f:facet> <h:outputText value="#{car.model}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Price" /> </f:facet> <h:outputText value="#{car.price}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Mileage" /> </f:facet> <h:outputText value="#{car.mileage}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="VIN Code" /> </f:facet> <h:outputText value="#{car.vin}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Items stock" /> </f:facet> <h:outputText value="#{car.stock}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <f:facet name="header"> <h:outputText value="Days Live" /> </f:facet> <h:outputText value="#{car.daysLive}" /> - </it:column> - </it:extendedDataTable> + </rich:column> + </rich:extendedDataTable> </h:form> <p>In order to turn on Ajax loading - just specify clientRows attribute with number of rows to be loaded on the client</p> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/functions/functions.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/functions/functions.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/functions/functions.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,8 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich" - xmlns:fn="http://richfaces.org/misc"> + xmlns:rich="http://richfaces.org/rich"> <p> RichFaces provides set of functions for more convinient work with DOM tree and to use some server side expressions. @@ -14,21 +13,21 @@ Here is the current list: </p> <ul> - <li><b>fn:clientId(id)</b> - returns client Id for component by it's short id.</li> - <li><b>fn:element(id)</b> - returns DOM element for the passed short id</li> - <li><b>fn:component(id)</b> - returns richfaces client component instance to call some API method.</li> - <li><b>fn:isUserInRole(role)</b> - returns is the user has specified role.</li> - <li><b>fn:findComponent(id)</b> - returns component instance for given short id</li> + <li><b>rich:clientId(id)</b> - returns client Id for component by it's short id.</li> + <li><b>rich:element(id)</b> - returns DOM element for the passed short id</li> + <li><b>rich:component(id)</b> - returns richfaces client component instance to call some API method.</li> + <li><b>rich:isUserInRole(role)</b> - returns is the user has specified role.</li> + <li><b>rich:findComponent(id)</b> - returns component instance for given short id</li> </ul> -<p>For example the result of #{fn:element('input')} expression will be - document.getElementById('formId:input').</p> +<p>For example the result of #{rich:element('input')} expression will be - document.getElementById('formId:input').</p> <p>And here is one more simple example. There is no need in Bean creation in order to store the value. It's picked from component instance by using rich:findComponent call.</p> <h:form> <h:inputText id="input"> <a4j:ajax render="out"/> </h:inputText> - <h:outputText value="#{fn:findComponent('input').value}" id="out"/> + <h:outputText value="#{rich:findComponent('input').value}" id="out"/> </h:form> - <p>One more sample could be found at dataScroller API page. There are fn:component used for calling JS API of dataScroller.</p> + <p>One more sample could be found at dataScroller API page. There are rich:component used for calling JS API of dataScroller.</p> <p>This set goes to be extended continously. Rise jira or forum requests if you have proposals on new useful functions.</p> </ui:composition> \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/queue/queue.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/queue/queue.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/queue/queue.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -3,9 +3,9 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rfn="http://richfaces.org/misc" + xmlns:rich="http://richfaces.org/rich" xmlns:c="http://java.sun.com/jstl/core" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> + xmlns:r="http://java.sun.com/jsf/composite/rich"> <p>JSF 2 provides queue mechanism out-of the box already. And RichFaces queue just provides some additional customizations to improve the queue usability and allow to tune your performance while using Ajax as much as possible.</p> @@ -23,7 +23,7 @@ <li>Setting request delay to greater value reduces the greatly requests count on fast typing. (More similar requests are combined in the result)</li> </ul> Also pay your attention to the queue definition. Such definition (inside some form without a name) means that the queue options becomes global for the form. - <rich:panel> + <r:panel> <h:form id="form"> <a4j:queue requestDelay="#{queueBean.requestDelay}"/> <h:panelGrid columns="1" width="100%"> @@ -44,7 +44,7 @@ <h:outputText value="DOM updates count:" /> <h:outputText value="0" id="updates" /> </h:panelGrid> - <rich:message for="form:delay" style="color:red;" /> + <r:message for="form:delay" style="color:red;" /> <h:panelGrid columns="2"> <h:outputText value="Request delay:" /> <h:inputText value="#{queueBean.requestDelay}" id="delay" @@ -57,13 +57,13 @@ </h:panelGrid> </h:panelGrid> </h:form> - </rich:panel> + </r:panel> <script type="text/javascript"> var events = 0; var updates = 0; - var outEvents = #{rfn:element('events')}; - var outUpdates = #{rfn:element('updates')}; - var outRequests = #{rfn:element('requests')}; + var outEvents = #{rich:element('events')}; + var outUpdates = #{rich:element('updates')}; + var outRequests = #{rich:element('requests')}; var requests=0; function addEvent(){ Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/repeat/simpleGrid.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,8 +4,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich" - xmlns:it="http://richfaces.org/iteration"> + xmlns:r="http://java.sun.com/jsf/composite/rich" + xmlns:rich="http://richfaces.org/rich"> <ui:composition> <p>a4j:repeat is a base iteration component of RichFaces. It allows @@ -15,7 +15,7 @@ <a4j:outputPanel id="panel" layout="block"> <a4j:repeat value="#{capitalsBean.capitals}" var="cap" rows="20" id="repeat"> - <rich:panel style="float:left; width:200px; padding:5px;"> + <r:panel style="float:left; width:200px; padding:5px;"> <f:facet name="header"> <h:panelGroup> <h:graphicImage value="#{cap.stateFlag}" /> @@ -28,11 +28,11 @@ <h:outputText value="State TimeZone" style="font-weight:bold" /> <h:outputText value="#{cap.timeZone}" /> </h:panelGrid> - </rich:panel> + </r:panel> </a4j:repeat> </a4j:outputPanel> <a4j:outputPanel layout="block"> - <it:dataScroller for="repeat" render="panel" /> + <rich:dataScroller for="repeat" render="panel" /> </a4j:outputPanel> </h:form> </ui:composition> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-06-02 15:40:05 UTC (rev 17465) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-06-02 15:44:40 UTC (rev 17466) @@ -4,7 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:it="http://richfaces.org/iteration"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition> <p>This sample shows simple master-detail table implemented using<b> rich:dataTable</b> and<b> rich:subtable</b> components</p> @@ -17,60 +17,60 @@ <li>The developer could get control on current states of subTables using its <b>expanded</b> attribute.</li> </ul> <h:form> - <it:dataTable value="#{carsBean.inventoryVendorLists}" var="list"> + <rich:dataTable value="#{carsBean.inventoryVendorLists}" var="list"> <f:facet name="header"> - <it:columnGroup> - <it:column colspan="6"> + <rich:columnGroup> + <rich:column colspan="6"> <h:outputText value="Cars marketplace" /> - </it:column> - <it:column breakRowBefore="true"> + </rich:column> + <rich:column breakRowBefore="true"> <h:outputText value="Model" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="Price" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="Mileage" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="VIN Code" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="Items stock" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="Days Live" /> - </it:column> - </it:columnGroup> + </rich:column> + </rich:columnGroup> </f:facet> - <it:column colspan="6"> - <it:subTableToggleControl for="sbtbl"/> + <rich:column colspan="6"> + <rich:subTableToggleControl for="sbtbl"/> <h:outputText value="#{list.vendor}" /> - </it:column> - <it:subTable value="#{list.vendorItems}" var="item" id="sbtbl" expandMode="client"> - <it:column> + </rich:column> + <rich:subTable value="#{list.vendorItems}" var="item" id="sbtbl" expandMode="client"> + <rich:column> <h:outputText value="#{item.model}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{item.price}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{item.mileage}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{item.vin}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{item.stock}" /> - </it:column> - <it:column> + </rich:column> + <rich:column> <h:outputText value="#{item.daysLive}" /> - </it:column> + </rich:column> <f:facet name="footer"> <h:outputText value="Total of #{list.vendor} Cars: #{list.count}" /> </f:facet> - </it:subTable> - </it:dataTable> + </rich:subTable> + </rich:dataTable> </h:form> </ui:composition> </html> \ No newline at end of file