Author: manaRH Date: 2008-11-18 18:40:05 -0500 (Tue, 18 Nov 2008) New Revision: 9601 Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/accept.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/admin.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/process.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/ship.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/browse.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/checkout.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/complete.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/confirm.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/dvd.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/home.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/account.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/card.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/complete.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/contact.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/showorders.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/book.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/confirm.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/conversations.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/home.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/hotel.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/main.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/password.xhtml branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/register.xhtml Log: adding ids for dvdstore and jpa example Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/accept.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/accept.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/accept.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -23,70 +23,71 @@ <p>Please accept or reject the order.</p> <div class="cntInfo"> - <h:panelGrid columns="2"> - <h:outputText value="Order" /> - <h:outputText value="#{order.orderId}" /> + <h:panelGrid id="AcceptancePanel" columns="2"> + <h:outputText id="OrderText" value="Order" /> + <h:outputText id="OrderIdValue" value="#{order.orderId}" /> - <h:outputText value="Order date:" /> - <h:outputText value="#{order.orderDate}"> + <h:outputText id="OrderDateText" value="Order date:" /> + <h:outputText id="OrderDateValue" value="#{order.orderDate}"> <s:convertDateTime type="both" dateStyle="full"/> </h:outputText> - <h:outputText value="Net Amount:" /> - <h:outputText value="#{order.netAmount}"> + <h:outputText id="NetAmountText" value="Net Amount:" /> + <h:outputText id="NetAmountValue" value="#{order.netAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="Tax:" /> - <h:outputText value="#{order.tax}"> + <h:outputText id="TaxText" value="Tax:" /> + <h:outputText id="TaxValue" value="#{order.tax}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="Total Amount:" /> - <h:outputText value="#{order.totalAmount}"> + <h:outputText id="TotalAmountText" value="Total Amount:" /> + <h:outputText id="TotalAmountValue" value="#{order.totalAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:panelGrid> <div class="cntInfo"> - <h:dataTable value="#{order.orderLines}" + <h:dataTable id="OrderLinesDataTable" + value="#{order.orderLines}" var="item" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartQuantityColumn}" /> + <h:column id="column1"> + <f:facet id="QuantityFacet" name="header"> + <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" /> </f:facet> - <h:outputText value="#{item.quantity}" /> + <h:outputText id="QuantityValue" value="#{item.quantity}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartTitleColumn}" /> + <h:column id="column2"> + <f:facet id="TitleFacet" name="header"> + <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" /> </f:facet> - <h:outputText value="#{item.product.title}" /> + <h:outputText id="TitleValue" value="#{item.product.title}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartActorColumn}" /> + <h:column id="column3"> + <f:facet id="ActorFacet" name="header"> + <h:outputText id="ActorText" value="#{messages.cartActorColumn}" /> </f:facet> - <h:outputText value="#{item.product.actors[0].name}" /> + <h:outputText id="ActorValue" value="#{item.product.actors[0].name}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartPriceColumn}" /> + <h:column id="column4"> + <f:facet id="PriceFacet" name="header"> + <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" /> </f:facet> - <h:outputText value="#{item.product.price}"> + <h:outputText id="PriceValue" value="#{item.product.price}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> </h:dataTable> </div> - <h:form> - <h:commandButton action="#{accept.reject}" value="Reject Order" /> - <h:commandButton action="#{accept.accept}" value="Accept Order" /> + <h:form id="AcceptRejectForm"> + <h:commandButton id="AcceptOrderButton" action="#{accept.reject}" value="Reject Order" /> + <h:commandButton id="RejectOrderButton" action="#{accept.accept}" value="Accept Order" /> </h:form> </div> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/admin.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/admin.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/admin.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -60,33 +60,34 @@ <p>There are no pooled tasks to be assigned.</p> </f:subview> - <h:dataTable rendered="#{not empty pooledTaskInstanceList}" + <h:dataTable id="TaskAssignmentDataTable" + rendered="#{not empty pooledTaskInstanceList}" value="#{pooledTaskInstanceList}" var="task" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header">Order Id</f:facet> + <h:column id="column1"> + <f:facet id="OrderIdFacet" name="header">Order Id</f:facet> #{task.variables['orderId']} </h:column> - <h:column> - <f:facet name="header">Task</f:facet> - <h:outputText value="#{task.description}" /> + <h:column id="column2"> + <f:facet id="TaskFacet" name="header">Task</f:facet> + <h:outputText id="TaskDescription" value="#{task.description}" /> </h:column> - <h:column> - <f:facet name="header">Order Amount</f:facet> - <h:outputText value="#{task.variables['amount']}"> + <h:column id="column3"> + <f:facet id="OrderAmountFacet" name="header">Order Amount</f:facet> + <h:outputText id="OrderAmountValue" value="#{task.variables['amount']}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> - <h:column> - <f:facet name="header">Customer</f:facet> - <h:outputText value="#{task.variables['customer']}" /> + <h:column id="column4"> + <f:facet id="CustomerFacet" name="header">Customer</f:facet> + <h:outputText id="CustomerValue" value="#{task.variables['customer']}" /> </h:column> - <h:column> - <s:button action="#{pooledTask.assignToCurrentActor}" taskInstance="#{task}" + <h:column id="column5"> + <s:button id="AssignButton" action="#{pooledTask.assignToCurrentActor}" taskInstance="#{task}" value="Assign"/> </h:column> </h:dataTable> @@ -97,29 +98,30 @@ <p>There are no orders to be accepted.</p> </f:subview> - <h:dataTable rendered="#{not empty taskInstanceListForType['approve']}" + <h:dataTable id="OrderAcceptanceDataTable" + rendered="#{not empty taskInstanceListForType['approve']}" value="#{taskInstanceListForType['approve']}" var="task" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header">Order Id</f:facet> + <h:column id="column1"> + <f:facet id="AcceptanceIdFacet" name="header">Order Id</f:facet> #{task.variables['orderId']} </h:column> - <h:column> - <f:facet name="header">Order Amount</f:facet> - <h:outputText value="#{task.variables['amount']}"> + <h:column id="column2"> + <f:facet id="AcceptanceAmountFacet" name="header">Order Amount</f:facet> + <h:outputText id="AcceptanceAmountValue" value="#{task.variables['amount']}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> - <h:column> - <f:facet name="header">Customer</f:facet> - <h:outputText value="#{task.variables['customer']}" /> + <h:column id="column3"> + <f:facet id="AcceptanceCustomerFacet" name="header">Customer</f:facet> + <h:outputText id="AcceptanceCustomerValue" value="#{task.variables['customer']}" /> </h:column> - <h:column> - <s:button action="#{accept.viewTask}" taskInstance="#{task}" + <h:column id="column4"> + <s:button id="AcceptanceTaskButton" action="#{accept.viewTask}" taskInstance="#{task}" value="Review"/> </h:column> </h:dataTable> @@ -128,29 +130,30 @@ <f:subview id="no_shipping" rendered="#{empty taskInstanceListForType['ship']}"> <p>There are no orders to be shipped.</p> </f:subview> - <h:dataTable rendered="#{not empty taskInstanceListForType['ship']}" + <h:dataTable id="ShippingDataTable" + rendered="#{not empty taskInstanceListForType['ship']}" value="#{taskInstanceListForType['ship']}" var="task" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header">Order Id</f:facet> + <h:column id="column1"> + <f:facet id="ShippingIdFacet" name="header">Order Id</f:facet> #{task.variables['orderId']} </h:column> - <h:column> - <f:facet name="header">Order Amount</f:facet> - <h:outputText value="#{task.variables['amount']}"> + <h:column id="column2"> + <f:facet id="ShippingAmountFacet" name="header">Order Amount</f:facet> + <h:outputText id="ShippingAmountValue" value="#{task.variables['amount']}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> - <h:column> - <f:facet name="header">Customer</f:facet> - <h:outputText value="#{task.variables['customer']}" /> + <h:column id="column3"> + <f:facet id="ShippingCustomerFacet" name="header">Customer</f:facet> + <h:outputText id="ShippingCustomerValue" value="#{task.variables['customer']}" /> </h:column> - <h:column> - <s:button action="#{ship.viewTask}" taskInstance="#{task}" + <h:column id="column4"> + <s:button id="ShipButton" action="#{ship.viewTask}" taskInstance="#{task}" value="Ship"/> </h:column> </h:dataTable> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/process.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/process.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/process.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -26,30 +26,31 @@ <p>There are no active processes.</p> </f:subview> - <h:dataTable value="#{processInstanceList}" + <h:dataTable id="ProcessListDataTable" + value="#{processInstanceList}" var="process" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol" rendered="#{not empty processInstanceList}"> - <h:column> - <f:facet name="header">Process Definition</f:facet> + <h:column id="column1"> + <f:facet id="ProcessDefFacet" name="header">Process Definition</f:facet> #{process.processDefinition.name} </h:column> - <h:column> - <f:facet name="header">Process Start</f:facet> - <h:outputText value="#{process.start}"> + <h:column id="column2"> + <f:facet id="ProcessStartFacet" name="header">Process Start</f:facet> + <h:outputText id="ProcessStartTime" value="#{process.start}"> <s:convertDateTime type="both"/> </h:outputText> </h:column> - <h:column> - <f:facet name="header">Current Node</f:facet> + <h:column id="column3"> + <f:facet id="CurrentNodeFacet" name="header">Current Node</f:facet> #{process.rootToken.node.name} </h:column> - <h:column> - <f:facet name="header">Current Node Enter</f:facet> - <h:outputText value="#{process.rootToken.nodeEnter}"> + <h:column id="column4"> + <f:facet id="CurrentNodeEnterFacet" name="header">Current Node Enter</f:facet> + <h:outputText id="CurrentNodeEnterTime" value="#{process.rootToken.nodeEnter}"> <s:convertDateTime type="both"/> </h:outputText> </h:column> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/ship.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/ship.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/admin/ship.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -23,77 +23,78 @@ <p>Please enter the tracking number below.</p> <div class="cntInfo"> - <h:form> - <h:panelGrid columns="2"> - <h:outputText value="Order Number:" /> - <h:outputText value="#{order.orderId}" /> + <h:form id="ShippingForm"> + <h:panelGrid id="ShippingDetailPanel" columns="2"> + <h:outputText id="OrderIdText" value="Order Number:" /> + <h:outputText id="OrderIdValue" value="#{order.orderId}" /> - <h:outputText value="Order date:" /> - <h:outputText value="#{order.orderDate}"> + <h:outputText id="OrderDateText" value="Order date:" /> + <h:outputText id="OrderDateValue" value="#{order.orderDate}"> <s:convertDateTime type="both" dateStyle="full"/> </h:outputText> - <h:outputText value="Net Amount:" /> - <h:outputText value="#{order.netAmount}"> + <h:outputText id="NetAmountText" value="Net Amount:" /> + <h:outputText id="NetAmountValue" value="#{order.netAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="Tax:" /> - <h:outputText value="#{order.tax}"> + <h:outputText id="TaxText" value="Tax:" /> + <h:outputText id="TaxValue" value="#{order.tax}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="Total Amount:" /> - <h:outputText value="#{order.totalAmount}"> + <h:outputText id="TotalAmountText" value="Total Amount:" /> + <h:outputText id="TotalAmountValue" value="#{order.totalAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="Tracking number:" /> - <h:panelGroup> + <h:outputText id="TrackingNumberText" value="Tracking number:" /> + <h:panelGroup id="TrackingNumberPanel"> <!-- required, min length=4 --> <h:inputText id="trackingNumber" value="#{ship.track}" required="true"/> - <h:message for="trackingNumber" styleClass="cntError" /> + <h:message id="message" for="trackingNumber" styleClass="cntError" /> </h:panelGroup> </h:panelGrid> <div class="cntInfo"> - <h:dataTable value="#{order.orderLines}" + <h:dataTable id="OrderLinesDataTable" + value="#{order.orderLines}" var="item" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartQuantityColumn}" /> + <h:column id="column1"> + <f:facet id="QuantityFacet" name="header"> + <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" /> </f:facet> - <h:outputText value="#{item.quantity}"/> + <h:outputText id="QuantityValue" value="#{item.quantity}"/> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartTitleColumn}" /> + <h:column id="column2"> + <f:facet id="TitleFacet" name="header"> + <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" /> </f:facet> - <h:outputText value="#{item.product.title}" /> + <h:outputText id="TitleValue" value="#{item.product.title}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartActorColumn}" /> + <h:column id="column3"> + <f:facet id="ActorFacet" name="header"> + <h:outputText id="ActorText" value="#{messages.cartActorColumn}" /> </f:facet> - <h:outputText value="#{item.product.actors[0].name}" /> + <h:outputText id="ActorValue" value="#{item.product.actors[0].name}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartPriceColumn}" /> + <h:column id="column4"> + <f:facet id="PriceFacet" name="header"> + <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" /> </f:facet> - <h:outputText value="#{item.product.price}"> + <h:outputText id="PriceValue" value="#{item.product.price}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> </h:dataTable> </div> - <h:commandButton action="#{ship.ship}" value="Ship" /> + <h:commandButton id="ShipButton" action="#{ship.ship}" value="Ship" /> </h:form> </div> </ui:define> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/browse.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/browse.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/browse.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -35,14 +35,14 @@ <ui:repeat value="#{topProducts}" var="item"> <div class="bestinner"> <div class="besttitle"> - <s:link view="/dvd.xhtml"> + <s:link id="TitleLink" view="/dvd.xhtml"> #{fn:length(item.title) gt 14 ? fn:substring(item.title,0,13) : item.title} - <f:param name="id" value="#{item.productId}"/> + <f:param id="ProductIdForTextLink" name="id" value="#{item.productId}"/> </s:link> </div> <div class="bestimage"> - <s:link view="/dvd.xhtml"> - <f:param name="id" value="#{item.productId}"/> + <s:link id="ImageLink" view="/dvd.xhtml"> + <f:param id="ProductIdForImage" name="id" value="#{item.productId}"/> <img src="#{item.imageURL}" /> </s:link> </div> @@ -53,21 +53,21 @@ <f:subview id="searchresults" rendered="#{searchResults.rowCount == 0}"> <h2> - <h:outputText value="#{messages.noSearchResultsHeader}" /> + <h:outputText id="NoResultsMessage" value="#{messages.noSearchResultsHeader}" /> </h2> </f:subview> - <h:form rendered="#{searchResults.rowCount > 0}"> + <h:form id="SearchResultsForm" rendered="#{searchResults.rowCount > 0}"> <div class="controlBar"> <div class="buttonbox"> <div class="button"> - <h:commandLink action="#{search.nextPage}" rendered="#{!search.lastPage}"> + <h:commandLink id="NextPageLink" action="#{search.nextPage}" rendered="#{!search.lastPage}"> <img src="img/arrow-r.png" /> </h:commandLink> &#160; </div> <div class="button"> - <h:commandLink action="#{search.prevPage}" rendered="#{!search.firstPage}"> + <h:commandLink id="PreviousPageLink" action="#{search.prevPage}" rendered="#{!search.firstPage}"> <img src="img/arrow-l.png" /> </h:commandLink> &#160; @@ -77,46 +77,48 @@ <div class="message">#{messages.searchResultsHeader}</div> </div> - <h:dataTable value="#{searchResults}" + <h:dataTable id="SearchResultsTable" + value="#{searchResults}" var="product" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="results" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.searchResultsAdd}" /> + <h:column id="column1"> + <f:facet id="AddToCartFacet" name="header"> + <h:outputText id="AddToCartText" value="#{messages.searchResultsAdd}" /> </f:facet> - <h:selectBooleanCheckbox value="#{searchSelections[product]}"/> + <h:selectBooleanCheckbox id="AddToCartCheckbox" value="#{searchSelections[product]}"/> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.searchResultsTitle}" /> + <h:column id="column2"> + <f:facet id="TitleFacet" name="header"> + <h:outputText id="TitleText" value="#{messages.searchResultsTitle}" /> </f:facet> - <s:link view="/dvd.xhtml" value="#{product.title}"> - <f:param name="id" value="#{product.productId}"/> + <s:link id="TitleLink" view="/dvd.xhtml" value="#{product.title}"> + <f:param id="ProductId" name="id" value="#{product.productId}"/> </s:link> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Starring" /> + <h:column id="column3"> + <f:facet id="StarringFacet" name="header"> + <h:outputText id="StarringText" value="Starring" /> </f:facet> - <h:outputText value="#{product.actors[0].name}" /> + <h:outputText id="StarringValue" value="#{product.actors[0].name}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.searchResultsPrice}" /> + <h:column id="column4"> + <f:facet id="PriceFacet" name="header"> + <h:outputText id="PriceText" value="#{messages.searchResultsPrice}" /> </f:facet> - <h:outputText value="#{product.price}"> + <h:outputText id="PriceValue" value="#{product.price}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> </h:dataTable> - <h:commandButton action="#{search.addAllToCart}" + <h:commandButton id="SearchUpdateButton" + action="#{search.addAllToCart}" value="#{messages.searchUpdateButton}"/> </h:form> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/checkout.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/checkout.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/checkout.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -29,85 +29,90 @@ <f:subview id="emptycart" rendered="#{empty cart.cart}"> <p>Your cart is empty.</p> - <h:form> - <h:commandButton action="browse" value="Continue Shopping" /> + <h:form id="EmptyCartForm"> + <h:commandButton id="ContinueShoppingButton" action="browse" value="Continue Shopping" /> </h:form> </f:subview> <f:subview id="cartdetails" rendered="#{not empty cart.cart}"> - <h:form> - <h:dataTable value="#{cart.cart}" var="item" + <h:form id="CartDetailsForm"> + <h:dataTable id="CartItemsTable" + value="#{cart.cart}" var="item" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartRemoveColumn}" /> + <h:column id="column1"> + <f:facet id="CartRemoveFacet" name="header"> + <h:outputText id="CartRemoveText" value="#{messages.cartRemoveColumn}" /> </f:facet> - <h:selectBooleanCheckbox value="#{cart.cartSelection[item]}"/> + <h:selectBooleanCheckbox id="CartRemoveCheckbox" value="#{cart.cartSelection[item]}"/> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartTitleColumn}" /> + <h:column id="column2"> + <f:facet id="TitleFacet" name="header"> + <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" /> </f:facet> - <h:outputText value="#{item.product.title}" /> + <h:outputText id="TitleValueText" value="#{item.product.title}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartActorColumn}" /> + <h:column id="column3"> + <f:facet id="ActorFacet" name="header"> + <h:outputText id="ActorText" value="#{messages.cartActorColumn}" /> </f:facet> - <h:outputText value="#{item.product.actors[0].name}" /> + <h:outputText id="ActorValueText" value="#{item.product.actors[0].name}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartPriceColumn}" /> + <h:column id="column4"> + <f:facet id="PriceFacet" name="header"> + <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" /> </f:facet> - <h:outputText value="#{item.product.price}"> + <h:outputText id="PriceValueText" value="#{item.product.price}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartQuantityColumn}" /> + <h:column id="column5"> + <f:facet id="QuantityFacet" name="header"> + <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" /> </f:facet> - <h:inputText value="#{item.quantity}" size="6" /> + <h:inputText id="QuantityValueText" value="#{item.quantity}" size="6" /> </h:column> </h:dataTable> - <h:commandButton action="browse" + <h:commandButton id="ContinueShoppingButton" + action="browse" value="Continue Shopping" /> &#160; - <h:commandButton action="#{cart.resetCart}" + <h:commandButton id="ResetCartButton" + action="#{cart.resetCart}" value="Empty Cart" /> &#160; - <h:commandButton action="#{cart.updateCart}" + <h:commandButton id="UpdateCartButton" + action="#{cart.updateCart}" value="#{messages.checkoutUpdateButton}" /> </h:form> <div style="width: 100%;"> <div class="cntInfo" style="float:right;"> - <h:panelGrid columns="2"> - <h:outputText value="#{messages.checkoutSubtotal}" /> - <h:outputText value="#{cart.subtotal}"> + <h:panelGrid id="CostSummary" columns="2"> + <h:outputText id="CartSubtotalText" value="#{messages.checkoutSubtotal}" /> + <h:outputText id="CartSubtotalValue" value="#{cart.subtotal}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="#{messages.checkoutTax}" /> - <h:outputText value="#{cart.tax}"> + <h:outputText id="CartTaxText" value="#{messages.checkoutTax}" /> + <h:outputText id="CartTaxValue" value="#{cart.tax}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="#{messages.checkoutTotal}" /> - <h:outputText value="#{cart.total}"> + <h:outputText id="CartTotalText" value="#{messages.checkoutTotal}" /> + <h:outputText id="CartTotalValue" value="#{cart.total}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:panelGrid> <f:subview id="purchaseaction" rendered="#{identity.loggedIn}"> - <h:form> - <h:commandButton action="#{checkout.createOrder}" + <h:form id="PurchaseActionForm"> + <h:commandButton id="PurchaseButton" + action="#{checkout.createOrder}" value="#{messages.checkoutPurchaseButton}" /> </h:form> </f:subview> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/complete.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/complete.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/complete.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -20,50 +20,51 @@ <f:subview id="no_order" rendered="#{completedOrder == null}"> <p>Your order could not be completed.</p> - <h:form> - <h:commandButton action="browse" value="Continue Shopping" /> + <h:form id="NoOrderForm"> + <h:commandButton id="ContinueShoppingButton" action="browse" value="Continue Shopping" /> </h:form> </f:subview> <f:subview id="orderdetail" rendered="#{completedOrder != null}"> <h2>#{messages.checkoutCompleteHeader}</h2> - <h:form> - <h:dataTable value="#{completedOrder.orderLines}" + <h:form id="OrderDetailForm"> + <h:dataTable id="OrderDetailDataTable" + value="#{completedOrder.orderLines}" var="item" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartItemColumn}" /> + <h:column id="column1"> + <f:facet id="ItemFacet" name="header"> + <h:outputText id="ItemText" value="#{messages.cartItemColumn}" /> </f:facet> - <h:outputText value="#{item.position}" /> + <h:outputText id="ItemValue" value="#{item.position}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartQuantityColumn}" /> + <h:column id="column2"> + <f:facet id="QuantityFacet" name="header"> + <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" /> </f:facet> - <h:outputText value="#{item.quantity}" /> + <h:outputText id="QuantityValue" value="#{item.quantity}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartTitleColumn}" /> + <h:column id="column3"> + <f:facet id="TitleFacet" name="header"> + <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" /> </f:facet> - <h:outputText value="#{item.product.title}" /> + <h:outputText id="TitleValue" value="#{item.product.title}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartActorColumn}" /> + <h:column id="column4"> + <f:facet id="ActorFacet" name="header"> + <h:outputText id="ActorText" value="#{messages.cartActorColumn}" /> </f:facet> - <h:outputText value="#{item.product.actors[0].name}" /> + <h:outputText id="ActorValue" value="#{item.product.actors[0].name}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartPriceColumn}" /> + <h:column id="column5"> + <f:facet id="PriceFacet" name="header"> + <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" /> </f:facet> - <h:outputText value="#{item.product.price}"> + <h:outputText id="PriceValue" value="#{item.product.price}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> @@ -73,19 +74,19 @@ <div style="width: 100%;"> <div class="cntInfo" style="float: right;"> - <h:panelGrid columns="2"> - <h:outputText value="#{messages.checkoutSubtotal}" /> - <h:outputText value="#{completedOrder.netAmount}"> + <h:panelGrid id="CheckoutSummary" columns="2"> + <h:outputText id="CartSubtotalText" value="#{messages.checkoutSubtotal}" /> + <h:outputText id="CartSubtotalValue" value="#{completedOrder.netAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="#{messages.checkoutTax}" /> - <h:outputText value="#{completedOrder.tax}"> + <h:outputText id="CartTaxText" value="#{messages.checkoutTax}" /> + <h:outputText id="CartTaxValue" value="#{completedOrder.tax}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="#{messages.checkoutTotal}" /> - <h:outputText value="#{completedOrder.totalAmount}"> + <h:outputText id="CartTotalText" value="#{messages.checkoutTotal}" /> + <h:outputText id="CartTotalValue" value="#{completedOrder.totalAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:panelGrid> @@ -97,12 +98,12 @@ <p class="orderBox cntAlert"> Thank you for ordering. - <h:outputText value="#{completedOrder.totalAmount}"> + <h:outputText id="TotalAmountValue" value="#{completedOrder.totalAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - charged was to your <h:outputText value="#{completedOrder.customer.creditCardTypeString}" />. + charged was to your <h:outputText id="CreditCartType" value="#{completedOrder.customer.creditCardTypeString}" />. Your order number is - <h:outputText value="#{completedOrder.orderId}" />. + <h:outputText id="OrderId" value="#{completedOrder.orderId}" />. </p> </f:subview> </ui:define> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/confirm.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/confirm.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/confirm.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -11,7 +11,7 @@ <ui:param name="page" value="cart" /> </ui:include> </ui:define> - + <ui:define name="sidebar"> <ui:include src="/WEB-INF/incl/login.xhtml" /> </ui:define> @@ -24,62 +24,63 @@ </f:subview> <f:subview id="orderdetail" rendered="#{currentOrder != null}"> - <h:form> - <h:dataTable value="#{currentOrder.orderLines}" var="line" + <h:form id="OrderDetailForm"> + <h:dataTable id="OrderDetailDataTable" + value="#{currentOrder.orderLines}" var="line" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartTitleColumn}" /> + <h:column id="column1"> + <f:facet id="TitleFacet" name="header"> + <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" /> </f:facet> - <h:outputText value="#{line.product.title}" /> + <h:outputText id="TitleValue" value="#{line.product.title}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartActorColumn}" /> + <h:column id="column2"> + <f:facet id="ActorFacet" name="header"> + <h:outputText id="ActorText" value="#{messages.cartActorColumn}" /> </f:facet> - <h:outputText value="#{line.product.actors[0].name}" /> + <h:outputText id="ActorValue" value="#{line.product.actors[0].name}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartPriceColumn}" /> + <h:column id="column3"> + <f:facet id="PriceFacet" name="header"> + <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" /> </f:facet> - <h:outputText value="#{line.product.price}"> + <h:outputText id="PriceValue" value="#{line.product.price}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartQuantityColumn}" /> + <h:column id="column4"> + <f:facet id="QuantityFacet" name="header"> + <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" /> </f:facet> - <h:outputText value="#{line.quantity}"/> + <h:outputText id="QuantityValue" value="#{line.quantity}"/> </h:column> </h:dataTable> </h:form> <div style="width: 100%;"> <div class="cntInfo" style="float:right;"> - <h:panelGrid columns="2"> - <h:outputText value="#{messages.checkoutSubtotal}" /> - <h:outputText value="#{currentOrder.netAmount}"> + <h:panelGrid id="CostSummary" columns="2"> + <h:outputText id="CartSubtotalText" value="#{messages.checkoutSubtotal}" /> + <h:outputText id="CartSubtotalValue" value="#{currentOrder.netAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="#{messages.checkoutTax}" /> - <h:outputText value="#{currentOrder.tax}"> + <h:outputText id="CartTaxText" value="#{messages.checkoutTax}" /> + <h:outputText id="CartTaxValue" value="#{currentOrder.tax}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="#{messages.checkoutTotal}" /> - <h:outputText value="#{currentOrder.totalAmount}"> + <h:outputText id="CartTotalText" value="#{messages.checkoutTotal}" /> + <h:outputText id="CartTotalValue" value="#{currentOrder.totalAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:panelGrid> - <h:form> + <h:form id="ConfirmOrCancelForm"> <h:commandButton id="Confirm" action="purchase" value="Confirm" /> &#160; <h:commandButton id="Cancel" action="cancel" value="Cancel" /> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/dvd.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/dvd.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/dvd.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -28,19 +28,19 @@ </f:subview> <div class="productinfo"> - <h:panelGrid columns="2"> - <h:outputText value="Title:" /> - <h:outputText value="#{dvd.title}" /> + <h:panelGrid id="ItemInfo" columns="2"> + <h:outputText id="TitleText" value="Title:" /> + <h:outputText id="TitleValue" value="#{dvd.title}" /> - <h:outputText value="Starring:" /> - <h:panelGroup> + <h:outputText id="StarringText" value="Starring:" /> + <h:panelGroup id="Actors"> <ui:repeat value="#{dvd.actors}" var="starring"> [#{starring.name}] </ui:repeat> </h:panelGroup> - <h:outputText value="Price:" /> - <h:outputText value="#{dvd.price}" /> + <h:outputText id="PriceText" value="Price:" /> + <h:outputText id="PriceValue" value="#{dvd.price}" /> </h:panelGrid> </div> @@ -49,9 +49,9 @@ </div> <div class="productbuttons"> - <s:button action="#{search.addToCart}" value="Add to Cart"/> + <s:button id="AddToCartButton" action="#{search.addToCart}" value="Add to Cart"/> &#160; - <s:button view="/browse.xhtml" value="Back to Search"/> + <s:button id="BackToSearchButton" view="/browse.xhtml" value="Back to Search"/> </div> </div> </ui:define> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/home.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/home.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/home.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -50,7 +50,7 @@ </p> - <s:button view="/browse.xhtml" value="Start Shopping" /> + <s:button id="StartShoppingButton" view="/browse.xhtml" value="Start Shopping" /> </ui:define> </ui:composition> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/account.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/account.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/account.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -18,9 +18,9 @@ </ui:define> <ui:define name="body"> - <h2><h:outputText value="#{messages.newCustomerHeader}" /></h2> + <h2><h:outputText id="NewCustomerHeader" value="#{messages.newCustomerHeader}" /></h2> - <p><em><h:outputText value="#{messages.newCustomerInfo}" /></em></p> + <p><em><h:outputText id="NewCustomerInfo" value="#{messages.newCustomerInfo}" /></em></p> <p> @@ -31,17 +31,17 @@ </p> <div class="cntInfo"> - <h:form> + <h:form id="NewAccountForm"> <table border="0"> <tr> <td class="cntForm">#{messages.newCustomerUN}</td> <td class="cntForm"> <h:inputText id="userName" required="true" value="#{customer.userName}"> - <s:validate /> + <s:validate/> </h:inputText> * </td> - <td><h:message for="userName" styleClass="cntError" /></td> + <td><h:message id="MessageForUserName" for="userName" styleClass="cntError" /></td> </tr> <tr> @@ -52,7 +52,7 @@ <s:validate /> </h:inputSecret> * </td> - <td><h:message for="password" styleClass="cntError" /></td> + <td><h:message id="MessageForPassword" for="password" styleClass="cntError" /></td> </tr> <tr> @@ -62,11 +62,11 @@ value="#{editCustomer.passwordVerify}"> </h:inputSecret> * </td> - <td><h:message for="passwordVerify" styleClass="cntError" /></td> + <td><h:message id="MessageForPasswordVerify" for="passwordVerify" styleClass="cntError" /></td> </tr> </table> - <h:commandButton action="next" value="Continue" /> + <h:commandButton id="ContinueButton" action="next" value="Continue" /> </h:form> </div> </ui:define> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/card.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/card.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/card.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -18,18 +18,18 @@ </ui:define> <ui:define name="body"> - <h2><h:outputText value="#{messages.newCustomerHeader}" /></h2> + <h2><h:outputText id="NewCustomerHeaderText" value="#{messages.newCustomerHeader}" /></h2> - <p><em><h:outputText value="#{messages.newCustomerInfo}" /></em></p> + <p><em><h:outputText id="NewCustomerInfoText" value="#{messages.newCustomerInfo}" /></em></p> <h:form id="NewAccountForm"> <table border="0"> <tr> <td>#{messages.newCustomerCCT}</td> <td> - <h:selectOneMenu value="#{customer.creditCardType}"> - <f:selectItems value="#{editCustomer.creditCardTypes}" /> - </h:selectOneMenu> + <h:selectOneMenu id="CreditCardMenu" value="#{customer.creditCardType}"> + <f:selectItems id="CreditCardTypes" value="#{editCustomer.creditCardTypes}" /> + </h:selectOneMenu> </td> </tr> @@ -39,41 +39,41 @@ <h:inputText id="creditCard" required="true" value="#{customer.creditCard}" /> <f:verbatim>*</f:verbatim> - <h:message for="creditCard" styleClass="cntError" /> + <h:message id="MessageForCreditCard" for="creditCard" styleClass="cntError" /> </td> </tr> <tr> <td>#{messages.newCustomerCCE}</td> <td> - <h:selectOneMenu value="#{customer.creditCardMonth}"> - <f:selectItem itemValue="1" itemLabel="#{messages.mo_1}" /> - <f:selectItem itemValue="2" itemLabel="#{messages.mo_2}" /> - <f:selectItem itemValue="3" itemLabel="#{messages.mo_3}" /> - <f:selectItem itemValue="4" itemLabel="#{messages.mo_4}" /> - <f:selectItem itemValue="5" itemLabel="#{messages.mo_5}" /> - <f:selectItem itemValue="6" itemLabel="#{messages.mo_6}" /> - <f:selectItem itemValue="7" itemLabel="#{messages.mo_7}" /> - <f:selectItem itemValue="8" itemLabel="#{messages.mo_8}" /> - <f:selectItem itemValue="9" itemLabel="#{messages.mo_9}" /> - <f:selectItem itemValue="10" itemLabel="#{messages.mo_10}" /> - <f:selectItem itemValue="11" itemLabel="#{messages.mo_11}" /> - <f:selectItem itemValue="12" itemLabel="#{messages.mo_12}" /> + <h:selectOneMenu id="CreditCardMonthMenu" value="#{customer.creditCardMonth}"> + <f:selectItem id="Jan" itemValue="1" itemLabel="#{messages.mo_1}" /> + <f:selectItem id="Feb" itemValue="2" itemLabel="#{messages.mo_2}" /> + <f:selectItem id="Mar" itemValue="3" itemLabel="#{messages.mo_3}" /> + <f:selectItem id="Apr" itemValue="4" itemLabel="#{messages.mo_4}" /> + <f:selectItem id="May" itemValue="5" itemLabel="#{messages.mo_5}" /> + <f:selectItem id="Jun" itemValue="6" itemLabel="#{messages.mo_6}" /> + <f:selectItem id="Jul" itemValue="7" itemLabel="#{messages.mo_7}" /> + <f:selectItem id="Aug" itemValue="8" itemLabel="#{messages.mo_8}" /> + <f:selectItem id="Sep" itemValue="9" itemLabel="#{messages.mo_9}" /> + <f:selectItem id="Oct" itemValue="10" itemLabel="#{messages.mo_10}" /> + <f:selectItem id="Nov" itemValue="11" itemLabel="#{messages.mo_11}" /> + <f:selectItem id="Dec" itemValue="12" itemLabel="#{messages.mo_12}" /> </h:selectOneMenu> - <h:selectOneMenu value="#{customer.creditCardYear}"> - <f:selectItem itemValue="2005" /> - <f:selectItem itemValue="2006" /> - <f:selectItem itemValue="2007" /> - <f:selectItem itemValue="2008" /> - <f:selectItem itemValue="2009" /> - <f:selectItem itemValue="2010" /> + <h:selectOneMenu id="CreditCardYearMenu" value="#{customer.creditCardYear}"> + <f:selectItem id="Year2005" itemValue="2005" /> + <f:selectItem id="Year2006" itemValue="2006" /> + <f:selectItem id="Year2007" itemValue="2007" /> + <f:selectItem id="Year2008" itemValue="2008" /> + <f:selectItem id="Year2009" itemValue="2009" /> + <f:selectItem id="Year2010" itemValue="2010" /> </h:selectOneMenu> </td> </tr> </table> - <h:commandButton action="next" value="#{messages.newCustomerSubmit}" /> + <h:commandButton id="SubmitNewCustomerButton" action="next" value="#{messages.newCustomerSubmit}" /> </h:form> </ui:define> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/complete.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/complete.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/complete.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -22,7 +22,7 @@ <h1>Welcome to the DVD Store</h1> <p>Your account has been created, and you have been automatically logged in. - You can <s:link view="/browse.xhtml">start shopping</s:link> immediately. + You can <s:link id="StartShoppingLink" view="/browse.xhtml">start shopping</s:link> immediately. </p> </f:subview> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/contact.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/contact.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/newuser/contact.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -18,12 +18,12 @@ </ui:define> <ui:define name="body"> - <h2><h:outputText value="#{messages.newCustomerHeader}" /></h2> + <h2><h:outputText id="CustomerHeaderText" value="#{messages.newCustomerHeader}" /></h2> - <p><em><h:outputText value="#{messages.newCustomerInfo}" /></em></p> + <p><em><h:outputText id="NewCustomerInfoText" value="#{messages.newCustomerInfo}" /></em></p> - <h:form> - <s:validateAll> + <h:form id="NewAccountForm"> + <s:validateAll id="ValidateAll"> <table border="0"> <tr> <td class="cntForm">#{messages.newCustomerFN}</td> @@ -31,7 +31,7 @@ <h:inputText id="firstName" required="true" value="#{customer.firstName}" /> * </td> - <td><h:message for="firstName" styleClass="cntError" /></td> + <td><h:message id="MessageForFirstName" for="firstName" styleClass="cntError" /></td> </tr> <tr> @@ -40,7 +40,7 @@ <h:inputText id="lastName" required="true" value="#{customer.lastName}" /> * </td> - <td><h:message for="lastName" styleClass="cntError" /></td> + <td><h:message id="MessageForLastName" for="lastName" styleClass="cntError" /></td> </tr> <tr> @@ -50,7 +50,7 @@ value="#{customer.address1}" /> * </td> <td> - <h:message for="address1" styleClass="cntError" /> + <h:message id="MessageForAddress1" for="address1" styleClass="cntError" /> </td> </tr> @@ -58,7 +58,7 @@ <tr> <td>#{messages.newCustomerA2}</td> <td> - <h:inputText value="#{customer.address2}" /> + <h:inputText id="Address2" value="#{customer.address2}" /> </td> <td>&nbsp;</td> </tr> @@ -70,7 +70,7 @@ value="#{customer.city}" /> * </td> <td> - <h:message for="city" styleClass="cntError" /> + <h:message id="MessageForCity" for="city" styleClass="cntError" /> </td> </tr> @@ -82,7 +82,7 @@ value="#{customer.state}" /> * </td> <td> - <h:message for="state" styleClass="cntError" /> + <h:message id="MessageForState" for="state" styleClass="cntError" /> </td> </tr> @@ -93,7 +93,7 @@ value="#{customer.zip}" /> * </td> <td> - <h:message for="zip" styleClass="cntError" /> + <h:message id="MessageForZip" for="zip" styleClass="cntError" /> </td> </tr> @@ -103,7 +103,7 @@ <h:inputText id="email" value="#{customer.email}" required="true"/> * </td> <td> - <h:message for="email" styleClass="cntError" /> + <h:message id="MessageForEmail" for="email" styleClass="cntError" /> </td> </tr> @@ -113,14 +113,14 @@ <h:inputText id="phone" value="#{customer.phone}" /> </td> <td> - <h:message for="phone" styleClass="cntError" /> + <h:message id="MessageForPhone" for="phone" styleClass="cntError" /> </td> </tr> </table> </s:validateAll> - <ui:remove><h:commandButton action="prev" value="Back" /></ui:remove> - <h:commandButton action="next" value="Continue" /> + <ui:remove><h:commandButton id="BackButton" action="prev" value="Back" /></ui:remove> + <h:commandButton id="ContinueButton" action="next" value="Continue" /> </h:form> </ui:define> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/showorders.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/showorders.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/view/showorders.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -27,31 +27,32 @@ <f:subview id="ordersummary" rendered="#{orders.rowAvailable}"> - <h:dataTable value="#{orders}" var="item" + <h:dataTable id="OrdersDataTable" + value="#{orders}" var="item" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header">Order Id</f:facet> + <h:column id="column1"> + <f:facet id="OrderIdFacet" name="header">Order Id</f:facet> #{item.orderId} </h:column> - <h:column> - <f:facet name="header">Date</f:facet> - <h:outputText value="#{item.orderDate}"> + <h:column id="column2"> + <f:facet id="OrderDateFacet" name="header">Date</f:facet> + <h:outputText id="OrderDateValue" value="#{item.orderDate}"> <s:convertDateTime type="both" dateStyle="full"/> </h:outputText> </h:column> - <h:column> - <f:facet name="header">Status</f:facet> + <h:column id="column3"> + <f:facet id="StatusFacet" name="header">Status</f:facet> #{item.status} </h:column> - <h:column> - <s:button action="#{showorders.detailOrder}" value="Show Details" /> + <h:column id="column4"> + <s:button id="ShowDetailsButton" action="#{showorders.detailOrder}" value="Show Details" /> </h:column> - <h:column> - <s:button action="#{showorders.cancelOrder}" value="Cancel" rendered="#{item.open}"/> + <h:column id="column5"> + <s:button id="CancelButton" action="#{showorders.cancelOrder}" value="Cancel" rendered="#{item.open}"/> </h:column> </h:dataTable> @@ -59,68 +60,70 @@ <div class="cntInfo"> <h2>Order Details</h2> - <h:panelGrid columns="2"> - <h:outputText value="Order Id:" /> - <h:outputText value="#{myorder.orderId}" /> + <h:panelGrid id="OrderDetailsPanel" columns="2"> + <h:outputText id="OrderIdText" value="Order Id:" /> + <h:outputText id="OrderIdValue" value="#{myorder.orderId}" /> - <h:outputText value="Status:" /> - <h:panelGroup> - <h:outputText value="#{myorder.status}" /> - <h:outputText value="(Tracking Number: #{myorder.trackingNumber})" + <h:outputText id="StatusText" value="Status:" /> + <h:panelGroup id="StatusPanel"> + <h:outputText id="StatusValue" value="#{myorder.status}" /> + <h:outputText id="TrackingNumber" + value="(Tracking Number: #{myorder.trackingNumber})" rendered="#{myorder.statusCode==3}"/> </h:panelGroup> - <h:outputText value="Order date:" /> - <h:outputText value="#{myorder.orderDate}"> + <h:outputText id="OrderDateText" value="Order date:" /> + <h:outputText id="OrderDateValue" value="#{myorder.orderDate}"> <s:convertDateTime type="both" dateStyle="full"/> </h:outputText> - <h:outputText value="Net Amount:" /> - <h:outputText value="#{myorder.netAmount}"> + <h:outputText id="NetAmountText" value="Net Amount:" /> + <h:outputText id="NetAmountValue" value="#{myorder.netAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="Tax:" /> - <h:outputText value="#{myorder.tax}"> + <h:outputText id="TaxText" value="Tax:" /> + <h:outputText id="TaxValue" value="#{myorder.tax}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> - <h:outputText value="Total Amount:" /> - <h:outputText value="#{myorder.totalAmount}"> + <h:outputText id="TotalAmountText" value="Total Amount:" /> + <h:outputText id="TotalAmountValue" value="#{myorder.totalAmount}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:panelGrid> <div class="cntInfo"> - <h:dataTable value="#{myorder.orderLines}" var="item" + <h:dataTable id="OrderLinesDataTable" + value="#{myorder.orderLines}" var="item" styleClass="dvdtable" headerClass="dvdtablehead" rowClasses="dvdtableodd,dvdtableeven" columnClasses="dvdtablecol"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartTitleColumn}" /> + <h:column id="column1"> + <f:facet id="TitleFacet" name="header"> + <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" /> </f:facet> - <h:outputText value="#{item.product.title}" /> + <h:outputText id="TitleValue" value="#{item.product.title}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartActorColumn}" /> + <h:column id="column2"> + <f:facet id="ActorFacet" name="header"> + <h:outputText id="ActorText" value="#{messages.cartActorColumn}" /> </f:facet> - <h:outputText value="#{item.product.actors[0].name}" /> + <h:outputText id="ActorValue" value="#{item.product.actors[0].name}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartQuantityColumn}" /> + <h:column id="column3"> + <f:facet id="QuantityFacet" name="header"> + <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" /> </f:facet> - <h:outputText value="#{item.quantity}" /> + <h:outputText id="QuantityValue" value="#{item.quantity}" /> </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{messages.cartPriceColumn}" /> + <h:column id="column4"> + <f:facet id="PriceFacet" name="header"> + <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" /> </f:facet> - <h:outputText value="#{item.product.price}"> + <h:outputText id="PriceValue" value="#{item.product.price}"> <f:convertNumber type="currency" currencySymbol="$" /> </h:outputText> </h:column> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/book.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/book.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/book.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -124,27 +124,27 @@ <div class="entry"> <div class="label"><h:outputLabel for="creditCardExpiryMonth">Credit Card Expiry:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="CreditCardExpiryDecorate"> <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}"> - <f:selectItem itemLabel="Jan" itemValue="1"/> - <f:selectItem itemLabel="Feb" itemValue="2"/> - <f:selectItem itemLabel="Mar" itemValue="3"/> - <f:selectItem itemLabel="Apr" itemValue="4"/> - <f:selectItem itemLabel="May" itemValue="5"/> - <f:selectItem itemLabel="Jun" itemValue="6"/> - <f:selectItem itemLabel="Jul" itemValue="7"/> - <f:selectItem itemLabel="Aug" itemValue="8"/> - <f:selectItem itemLabel="Sep" itemValue="9"/> - <f:selectItem itemLabel="Oct" itemValue="10"/> - <f:selectItem itemLabel="Nov" itemValue="11"/> - <f:selectItem itemLabel="Dec" itemValue="12"/> + <f:selectItem id="Jan" itemLabel="Jan" itemValue="1"/> + <f:selectItem id="Feb" itemLabel="Feb" itemValue="2"/> + <f:selectItem id="Mar" itemLabel="Mar" itemValue="3"/> + <f:selectItem id="Apr" itemLabel="Apr" itemValue="4"/> + <f:selectItem id="May" itemLabel="May" itemValue="5"/> + <f:selectItem id="Jun" itemLabel="Jun" itemValue="6"/> + <f:selectItem id="Jul" itemLabel="Jul" itemValue="7"/> + <f:selectItem id="Aug" itemLabel="Aug" itemValue="8"/> + <f:selectItem id="Sep" itemLabel="Sep" itemValue="9"/> + <f:selectItem id="Oct" itemLabel="Oct" itemValue="10"/> + <f:selectItem id="Nov" itemLabel="Nov" itemValue="11"/> + <f:selectItem id="Dec" itemLabel="Dec" itemValue="12"/> </h:selectOneMenu> <h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}"> - <f:selectItem itemLabel="2005" itemValue="2005"/> - <f:selectItem itemLabel="2006" itemValue="2006"/> - <f:selectItem itemLabel="2007" itemValue="2007"/> - <f:selectItem itemLabel="2008" itemValue="2008"/> - <f:selectItem itemLabel="2009" itemValue="2009"/> + <f:selectItem id="Year2005" itemLabel="2005" itemValue="2005"/> + <f:selectItem id="Year2006" itemLabel="2006" itemValue="2006"/> + <f:selectItem id="Year2007" itemLabel="2007" itemValue="2007"/> + <f:selectItem id="Year2008" itemLabel="2008" itemValue="2008"/> + <f:selectItem id="Year2009" itemLabel="2009" itemValue="2009"/> </h:selectOneMenu> </s:decorate> </div> @@ -153,7 +153,7 @@ </s:validateAll> <div class="entry errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </div> <div class="entry"> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/confirm.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/confirm.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/confirm.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -37,7 +37,7 @@ <div class="entry"> <div class="label">Total payment:</div> <div class="output"> - <h:outputText value="#{booking.total}"> + <h:outputText id="BookingTotal" value="#{booking.total}"> <f:convertNumber type="currency" currencySymbol="$"/> </h:outputText> @@ -45,11 +45,11 @@ </div> <div class="entry"> <div class="label">Check In Date:</div> - <div class="output"><h:outputText value="#{booking.checkinDate}"/></div> + <div class="output"><h:outputText id="BookingCheckinDate" value="#{booking.checkinDate}"/></div> </div> <div class="entry"> <div class="label">Check Out Date:</div> - <div class="output"><h:outputText value="#{booking.checkoutDate}"/></div> + <div class="output"><h:outputText id="BookingCheckoutDate" value="#{booking.checkoutDate}"/></div> </div> <div class="entry"> <div class="label">Credit Card #:</div> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/conversations.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/conversations.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/conversations.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -8,23 +8,23 @@ <div> <div class="section"> - <h1><h:outputText rendered="#{not empty conversationList}" value="Workspaces"/></h1> + <h1><h:outputText id="Workspaces" rendered="#{not empty conversationList}" value="Workspaces"/></h1> </div> <div class="section"> <h:form id="ConversationListForm"> <h:dataTable id="ConversationListDataTable" value="#{conversationList}" var="entry"> - <h:column> - <h:commandLink action="#{entry.select}" value="#{entry.description}"/> + <h:column id="column1"> + <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/> &#160; <h:outputText id="CurrentEntry" value="[current]" rendered="#{entry.current}"/> </h:column> - <h:column> - <h:outputText value="#{entry.startDatetime}"> + <h:column id="column2"> + <h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}"> <s:convertDateTime type="time" pattern="hh:mm"/> </h:outputText> - - <h:outputText value="#{entry.lastDatetime}"> + <h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}"> <s:convertDateTime type="time" pattern="hh:mm"/> </h:outputText> </h:column> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/home.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/home.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/home.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -20,15 +20,15 @@ <h:form id="login"> <fieldset> <div> - <h:outputLabel for="username">Login Name</h:outputLabel> + <h:outputLabel id="UsernameLabel" for="username">Login Name</h:outputLabel> <h:inputText id="username" value="#{identity.username}" style="width: 175px;"/> - <div class="errors"><h:message for="username"/></div> + <div class="errors"><h:message id="message" for="username"/></div> </div> <div> - <h:outputLabel for="password">Password</h:outputLabel> + <h:outputLabel id="PasswordLabel" for="password">Password</h:outputLabel> <h:inputSecret id="password" value="#{identity.password}" style="width: 175px;"/> </div> - <div class="errors"><h:messages globalOnly="true"/></div> + <div class="errors"><h:messages id="messages" globalOnly="true"/></div> <div class="buttonBox"><h:commandButton id="login" action="#{identity.login}" value="Account Login"/></div> <div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div> </fieldset> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/hotel.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/hotel.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/hotel.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -39,7 +39,7 @@ <div class="entry"> <div class="label">Nightly rate:</div> <div class="output"> - <h:outputText value="#{hotel.price}"> + <h:outputText id="HotelPrice" value="#{hotel.price}"> <f:convertNumber type="currency" currencySymbol="$"/> </h:outputText> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/main.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/main.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/main.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -14,28 +14,28 @@ <h:form id="main"> <span class="errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </span> <h1>Search Hotels</h1> <fieldset> <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> - <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> + <a:support id="onkeyup" event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> </h:inputText> &#160; <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/> &#160; - <a:status> - <f:facet name="start"> - <h:graphicImage value="/img/spinner.gif"/> + <a:status id="status"> + <f:facet id="StartFacet" name="start"> + <h:graphicImage id="SpinnerGif" value="/img/spinner.gif"/> </f:facet> </a:status> <br/> - <h:outputLabel for="pageSize">Maximum results:</h:outputLabel>&#160; - <h:selectOneMenu value="#{hotelSearch.pageSize}" id="pageSize"> - <f:selectItem itemLabel="5" itemValue="5"/> - <f:selectItem itemLabel="10" itemValue="10"/> - <f:selectItem itemLabel="20" itemValue="20"/> + <h:outputLabel id="MaximumResultsLabel" for="pageSize">Maximum results:</h:outputLabel>&#160; + <h:selectOneMenu id="pageSize" value="#{hotelSearch.pageSize}"> + <f:selectItem id="PageSize5" itemLabel="5" itemValue="5"/> + <f:selectItem id="PageSize10" itemLabel="10" itemValue="10"/> + <f:selectItem id="PageSize20" itemLabel="20" itemValue="20"/> </h:selectOneMenu> </fieldset> @@ -44,30 +44,30 @@ <a:outputPanel id="searchResults"> <div class="section"> - <h:outputText value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> + <h:outputText id="NoHotelsFoundMessage" value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> <h:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}"> - <h:column> - <f:facet name="header">Name</f:facet> + <h:column id="column1"> + <f:facet id="NameFacet" name="header">Name</f:facet> #{hot.name} </h:column> - <h:column> - <f:facet name="header">Address</f:facet> + <h:column id="column2"> + <f:facet id="AddressFacet" name="header">Address</f:facet> #{hot.address} </h:column> - <h:column> - <f:facet name="header">City, State</f:facet> + <h:column id="column3"> + <f:facet id="CityStateFacet" name="header">City, State</f:facet> #{hot.city}, #{hot.state}, #{hot.country} </h:column> - <h:column> - <f:facet name="header">Zip</f:facet> + <h:column id="column4"> + <f:facet id="ZipFacet" name="header">Zip</f:facet> #{hot.zip} </h:column> - <h:column> - <f:facet name="header">Action</f:facet> + <h:column id="column5"> + <f:facet id="ActionFacet" name="header">Action</f:facet> <s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/> </h:column> </h:dataTable> - <s:link value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/> + <s:link id="MoreResultsLink" value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/> </div> </a:outputPanel> @@ -76,34 +76,34 @@ </div> <div class="section"> <h:form id="bookings"> - <h:outputText value="No Bookings Found" rendered="#{bookings.rowCount==0}"/> + <h:outputText id="NoBookingsFoundMessage" value="No Bookings Found" rendered="#{bookings.rowCount==0}"/> <h:dataTable id="bookings" value="#{bookings}" var="book" rendered="#{bookings.rowCount>0}"> - <h:column> - <f:facet name="header">Name</f:facet> + <h:column id="column1"> + <f:facet id="NameFacet" name="header">Name</f:facet> #{book.hotel.name} </h:column> - <h:column> - <f:facet name="header">Address</f:facet> + <h:column id="column2"> + <f:facet id="AddressFacet" name="header">Address</f:facet> #{book.hotel.address} </h:column> - <h:column> - <f:facet name="header">City, State</f:facet> + <h:column id="column3"> + <f:facet id="CityStateFacet" name="header">City, State</f:facet> #{book.hotel.city}, #{book.hotel.state} </h:column> - <h:column> - <f:facet name="header">Check in date</f:facet> - <h:outputText value="#{book.checkinDate}"/> + <h:column id="column4"> + <f:facet id="CheckinDateFacet" name="header">Check in date</f:facet> + <h:outputText id="BookingCheckinDate" value="#{book.checkinDate}"/> </h:column> - <h:column> - <f:facet name="header">Check out date</f:facet> - <h:outputText value="#{book.checkoutDate}"/> + <h:column id="column5"> + <f:facet id="CheckoutDateFacet" name="header">Check out date</f:facet> + <h:outputText id="BookingCheckoutDate" value="#{book.checkoutDate}"/> </h:column> - <h:column> - <f:facet name="header">Confirmation number</f:facet> + <h:column id="column6"> + <f:facet id="ConfNumberFacet" name="header">Confirmation number</f:facet> #{book.id} </h:column> - <h:column> - <f:facet name="header">Action</f:facet> + <h:column id="column7"> + <f:facet id="ActionFacet" name="header">Action</f:facet> <h:commandLink id="cancel" value="Cancel" action="#{bookingList.cancel}"/> </h:column> </h:dataTable> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/password.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/password.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/password.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -14,10 +14,10 @@ <div class="section"> <h:form id="setpassword"> - <f:facet name="aroundInvalidField"> - <s:span styleClass="errors"/> + <f:facet id="AroundInvalidFieldFacet" name="aroundInvalidField"> + <s:span id="ErrorsSpan" styleClass="errors"/> </f:facet> - <f:facet name="afterInvalidField"> + <f:facet id="AfterInvalidFieldFacet" name="afterInvalidField"> <s:div styleClass="errors"> <s:message id="Message"/> </s:div> @@ -26,7 +26,7 @@ <fieldset> <div class="entry"> - <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> + <div class="label"><h:outputLabel id="PasswordLabel" for="password">Password:</h:outputLabel></div> <div class="input"> <s:decorate id="PasswordDecorate"> <h:inputSecret id="password" value="#{user.password}" required="true"> @@ -37,7 +37,7 @@ </div> <div class="entry"> - <div class="label"><h:outputLabel for="verify">Verify:</h:outputLabel></div> + <div class="label"><h:outputLabel id="VerifyLabel" for="verify">Verify:</h:outputLabel></div> <div class="input"> <s:decorate id="VerifyDecorate"> <h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/> @@ -46,7 +46,7 @@ </div> <div class="entry errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </div> <div class="entry"> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/register.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/register.xhtml 2008-11-18 17:34:03 UTC (rev 9600) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/view/register.xhtml 2008-11-18 23:40:05 UTC (rev 9601) @@ -27,43 +27,43 @@ <h:form id="register"> <fieldset> - <s:validateAll> + <s:validateAll id="ValidateAll"> - <f:facet name="aroundInvalidField"> - <s:span styleClass="errors"/> + <f:facet id="AroundInvalidFieldFacet" name="aroundInvalidField"> + <s:span id="ErrorsSpan" styleClass="errors"/> </f:facet> - <f:facet name="afterInvalidField"> - <s:div styleClass="errors"> - <s:message/> + <f:facet id="AfterInvalidFieldFacet" name="afterInvalidField"> + <s:div id="ErrorsDiv" styleClass="errors"> + <s:message id="message"/> </s:div> </f:facet> <div class="entry"> - <div class="label"><h:outputLabel for="username">Username:</h:outputLabel></div> + <div class="label"><h:outputLabel id="UsernameLabel" for="username">Username:</h:outputLabel></div> <div class="input"> <s:decorate id="usernameDecorate"> <h:inputText id="username" value="#{user.username}" required="true"> - <a:support event="onblur" reRender="usernameDecorate"/> + <a:support id="onblur" event="onblur" reRender="usernameDecorate"/> </h:inputText> </s:decorate> </div> </div> <div class="entry"> - <div class="label"><h:outputLabel for="name">Real Name:</h:outputLabel></div> + <div class="label"><h:outputLabel id="RealNameLabel" for="name">Real Name:</h:outputLabel></div> <div class="input"> <s:decorate id="nameDecorate"> <h:inputText id="name" value="#{user.name}" required="true"> - <a:support event="onblur" reRender="nameDecorate"/> + <a:support id="onblur" event="onblur" reRender="nameDecorate"/> </h:inputText> </s:decorate> </div> </div> <div class="entry"> - <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> + <div class="label"><h:outputLabel id="PasswordLabel" for="password">Password:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="passwordDecorate"> <h:inputSecret id="password" value="#{user.password}" required="true"/> </s:decorate> </div> @@ -72,7 +72,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="verify">Verify Password:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="verifyDecorate"> <h:inputSecret id="verify" value="#{register.verify}" required="true"/> </s:decorate> </div> @@ -81,7 +81,7 @@ </s:validateAll> <div class="entry errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </div> <div class="entry">