Author: stan.silvert(a)jboss.com Date: 2008-06-04 11:55:09 -0400 (Wed, 04 Jun 2008) New Revision: 8328 Modified: branches/Seam_2_0/examples/jpa/view/book.xhtml branches/Seam_2_0/examples/jpa/view/confirm.xhtml branches/Seam_2_0/examples/jpa/view/conversations.xhtml branches/Seam_2_0/examples/jpa/view/home.xhtml branches/Seam_2_0/examples/jpa/view/hotel.xhtml branches/Seam_2_0/examples/jpa/view/main.xhtml branches/Seam_2_0/examples/jpa/view/password.xhtml branches/Seam_2_0/examples/jpa/view/register.xhtml Log: JBSEAM-3048 Modified: branches/Seam_2_0/examples/jpa/view/book.xhtml =================================================================== --- branches/Seam_2_0/examples/jpa/view/book.xhtml 2008-06-04 14:47:55 UTC (rev 8327) +++ branches/Seam_2_0/examples/jpa/view/book.xhtml 2008-06-04 15:55:09 UTC (rev 8328) @@ -46,19 +46,19 @@ </div> </div> - <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="ErrosDiv" styleClass="errors"> + <s:message id="message"/> </s:div> </f:facet> <div class="entry"> - <div class="label"><h:outputLabel for="checkinDate">Check In Date:</h:outputLabel></div> + <div class="label"><h:outputLabel id="CheckinDateLabel" for="checkinDate">Check In Date:</h:outputLabel></div> <div class="input"> <s:decorate id="checkinDateDecorate"> <rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" style="width: auto;"/> @@ -67,7 +67,7 @@ </div> <div class="entry"> - <div class="label"><h:outputLabel for="checkoutDate">Check Out Date:</h:outputLabel></div> + <div class="label"><h:outputLabel id="CheckoutDateLabel" for="checkoutDate">Check Out Date:</h:outputLabel></div> <div class="input"> <s:decorate id="checkoutDateDecorate"> <rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate" style="width: auto;"/> @@ -75,47 +75,47 @@ </div> </div> <div class="entry"> - <div class="label"><h:outputLabel for="beds">Room Preference:</h:outputLabel></div> + <div class="label"><h:outputLabel id="RoomPrefLabel" for="beds">Room Preference:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="BookingBedsDecorate"> <h:selectOneMenu id="beds" value="#{booking.beds}"> - <f:selectItem itemLabel="One king-size bed" itemValue="1"/> - <f:selectItem itemLabel="Two double beds" itemValue="2"/> - <f:selectItem itemLabel="Three beds" itemValue="3"/> + <f:selectItem id="OneKingBed" itemLabel="One king-size bed" itemValue="1"/> + <f:selectItem id="TwoDoubleBeds" itemLabel="Two double beds" itemValue="2"/> + <f:selectItem id="ThreeBeds" itemLabel="Three beds" itemValue="3"/> </h:selectOneMenu> </s:decorate> </div> </div> <div class="entry"> - <div class="label"><h:outputLabel for="smoking">Smoking Preference:</h:outputLabel></div> + <div class="label"><h:outputLabel id="SmokingPrefLabel" for="smoking">Smoking Preference:</h:outputLabel></div> <div id="radio" class="input"> - <s:decorate> + <s:decorate id="SmokingDecorate"> <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection"> - <f:selectItem itemLabel="Smoking" itemValue="true"/> - <f:selectItem itemLabel="Non Smoking" itemValue="false"/> + <f:selectItem id="Smoking" itemLabel="Smoking" itemValue="true"/> + <f:selectItem id="NonSmoking" itemLabel="Non Smoking" itemValue="false"/> </h:selectOneRadio> </s:decorate> </div> </div> <div class="entry"> - <div class="label"><h:outputLabel for="creditCard">Credit Card #:</h:outputLabel></div> + <div class="label"><h:outputLabel id="CreditCardLabel" for="creditCard">Credit Card #:</h:outputLabel></div> <div class="input"> <s:decorate id="creditCardDecorate"> <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> - <a:support event="onblur" reRender="creditCardDecorate"/> + <a:support id="onblur" event="onblur" reRender="creditCardDecorate"/> </h:inputText> </s:decorate> </div> </div> <div class="entry"> - <div class="label"><h:outputLabel for="creditCardName">Credit Card Name:</h:outputLabel></div> + <div class="label"><h:outputLabel id="CreditCardNameLabel" for="creditCardName">Credit Card Name:</h:outputLabel></div> <div class="input"> <s:decorate id="creditCardNameDecorate"> <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> - <a:support event="onblur" reRender="creditCardNameDecorate"/> + <a:support id="onblur" event="onblur" reRender="creditCardNameDecorate"/> </h:inputText> </s:decorate> </div> @@ -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/Seam_2_0/examples/jpa/view/confirm.xhtml =================================================================== --- branches/Seam_2_0/examples/jpa/view/confirm.xhtml 2008-06-04 14:47:55 UTC (rev 8327) +++ branches/Seam_2_0/examples/jpa/view/confirm.xhtml 2008-06-04 15:55:09 UTC (rev 8328) @@ -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/Seam_2_0/examples/jpa/view/conversations.xhtml =================================================================== --- branches/Seam_2_0/examples/jpa/view/conversations.xhtml 2008-06-04 14:47:55 UTC (rev 8327) +++ branches/Seam_2_0/examples/jpa/view/conversations.xhtml 2008-06-04 15:55:09 UTC (rev 8328) @@ -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> - <h:dataTable value="#{conversationList}" var="entry"> - <h:column> - <h:commandLink action="#{entry.select}" value="#{entry.description}"/> + <h:form id="Conversations"> + <h:dataTable id="ConversationList" value="#{conversationList}" var="entry"> + <h:column id="column1"> + <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/> &#160; - <h:outputText value="[current]" rendered="#{entry.current}"/> + <h:outputText id="EntryCurrent" 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/Seam_2_0/examples/jpa/view/home.xhtml =================================================================== --- branches/Seam_2_0/examples/jpa/view/home.xhtml 2008-06-04 14:47:55 UTC (rev 8327) +++ branches/Seam_2_0/examples/jpa/view/home.xhtml 2008-06-04 15:55:09 UTC (rev 8328) @@ -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/Seam_2_0/examples/jpa/view/hotel.xhtml =================================================================== --- branches/Seam_2_0/examples/jpa/view/hotel.xhtml 2008-06-04 14:47:55 UTC (rev 8327) +++ branches/Seam_2_0/examples/jpa/view/hotel.xhtml 2008-06-04 15:55:09 UTC (rev 8328) @@ -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/Seam_2_0/examples/jpa/view/main.xhtml =================================================================== --- branches/Seam_2_0/examples/jpa/view/main.xhtml 2008-06-04 14:47:55 UTC (rev 8327) +++ branches/Seam_2_0/examples/jpa/view/main.xhtml 2008-06-04 15:55:09 UTC (rev 8328) @@ -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/Seam_2_0/examples/jpa/view/password.xhtml =================================================================== --- branches/Seam_2_0/examples/jpa/view/password.xhtml 2008-06-04 14:47:55 UTC (rev 8327) +++ branches/Seam_2_0/examples/jpa/view/password.xhtml 2008-06-04 15:55:09 UTC (rev 8328) @@ -14,21 +14,21 @@ <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/> + <s:message id="message"/> </s:div> </f:facet> <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> + <s:decorate id="DecoratePassword"> <h:inputSecret id="password" value="#{user.password}" required="true"> <s:validate/> </h:inputSecret> @@ -37,16 +37,16 @@ </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> + <s:decorate id="DecoratePasswordVerify"> <h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/> </s:decorate> </div> </div> <div class="entry errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </div> <div class="entry"> Modified: branches/Seam_2_0/examples/jpa/view/register.xhtml =================================================================== --- branches/Seam_2_0/examples/jpa/view/register.xhtml 2008-06-04 14:47:55 UTC (rev 8327) +++ branches/Seam_2_0/examples/jpa/view/register.xhtml 2008-06-04 15:55:09 UTC (rev 8328) @@ -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">