Seam SVN: r8369 - tags.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-06-10 16:34:56 -0400 (Tue, 10 Jun 2008)
New Revision: 8369
Added:
tags/JBoss_Seam_2_0_3_CR1/
Log:
create JBoss_Seam_2_0_3_CR1 tag
Copied: tags/JBoss_Seam_2_0_3_CR1 (from rev 8368, branches/Seam_2_0)
16 years, 6 months
Seam SVN: r8368 - in branches/Seam_2_0: build and 1 other directory.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-06-10 16:13:26 -0400 (Tue, 10 Jun 2008)
New Revision: 8368
Modified:
branches/Seam_2_0/build/default.build.properties
branches/Seam_2_0/changelog.txt
branches/Seam_2_0/readme.txt
Log:
Updated version information prior to tagging for the 2.0.3.CR1 release
Modified: branches/Seam_2_0/build/default.build.properties
===================================================================
--- branches/Seam_2_0/build/default.build.properties 2008-06-09 20:03:03 UTC (rev 8367)
+++ branches/Seam_2_0/build/default.build.properties 2008-06-10 20:13:26 UTC (rev 8368)
@@ -8,7 +8,7 @@
major.version 2
minor.version .0
patchlevel .3
-qualifier -SNAPSHOT
+qualifier .CR1
#
# Other program locations
# -----------------------
Modified: branches/Seam_2_0/changelog.txt
===================================================================
--- branches/Seam_2_0/changelog.txt 2008-06-09 20:03:03 UTC (rev 8367)
+++ branches/Seam_2_0/changelog.txt 2008-06-10 20:13:26 UTC (rev 8368)
@@ -1,6 +1,30 @@
JBoss Seam Changelog
====================
+Release Notes - JBoss Seam - Version 2.0.3.CR1
+
+** Feature Request
+ * [ JBSEAM-3003 ] maintain insertion order of parameters in UrlBuilder
+
+** Bug
+ * [ JBSEAM-2833 ] Glassfish Jee5 example deployment fails with NoClassDefFoundError: EDU/oswego/cs/dl/util/concurrent/ConcurrentReaderHashMap
+ * [ JBSEAM-2956 ] seambay example throws an exception when placing a bid on the camera
+ * [ JBSEAM-3027 ] seam-gen richfaces sakura skin not found
+ * [ JBSEAM-3049 ] javax.persistence.EntityNotFoundException on activating passivated entities that have been deleted
+ * [ JBSEAM-3053 ] Natural conversation id initialized at wrong time, leading to exceptions
+ * [ JBSEAM-3064 ] AuthorizationException when Load Testing - RuleBasedIdentity.hasPermission() returns false when it should return true
+ * [ JBSEAM-3071 ] Need to sanitize headers
+ * [ JBSEAM-3072 ] seam dist /extras directory is not there - no mail-ra.rar
+ * [ JBSEAM-3078 ] new entities are not wrapped by by conversation context flush
+ * [ JBSEAM-3083 ] urlBase on <m:message> does not work
+ * [ JBSEAM-3090 ] web XSD incorrectly declares servlet-session element
+
+** Task
+ * [ JBSEAM-3050 ] Move Seam scanner code into Seam Core
+ * [ JBSEAM-3048 ] Add id attribute to markup for JSF components in Seam examples
+ * [ JBSEAM-3058 ] HTML and CSS sanitation filters for Seam Text
+ * [ JBSEAM-3066 ] Include JBoss 5 compatible version of Facelets
+
Release Notes - JBoss Seam - Version 2.0.2.GA
** Bug
Modified: branches/Seam_2_0/readme.txt
===================================================================
--- branches/Seam_2_0/readme.txt 2008-06-09 20:03:03 UTC (rev 8367)
+++ branches/Seam_2_0/readme.txt 2008-06-10 20:13:26 UTC (rev 8368)
@@ -1,6 +1,6 @@
JBoss Seam - Contextual Component framework for Java EE 5
=========================================================
-version 2.0.2.GA, May 2008
+version 2.0.3.CR1, June 2008
This software is distributed under the terms of the FSF Lesser Gnu
Public License (see lgpl.txt).
16 years, 6 months
Seam SVN: r8367 - trunk/examples/jpa/view.
by seam-commits@lists.jboss.org
Author: stan.silvert(a)jboss.com
Date: 2008-06-09 16:03:03 -0400 (Mon, 09 Jun 2008)
New Revision: 8367
Modified:
trunk/examples/jpa/view/book.xhtml
trunk/examples/jpa/view/confirm.xhtml
trunk/examples/jpa/view/conversations.xhtml
trunk/examples/jpa/view/home.xhtml
trunk/examples/jpa/view/hotel.xhtml
trunk/examples/jpa/view/main.xhtml
trunk/examples/jpa/view/password.xhtml
trunk/examples/jpa/view/register.xhtml
Log:
JBSEAM-3048
Modified: trunk/examples/jpa/view/book.xhtml
===================================================================
--- trunk/examples/jpa/view/book.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
+++ trunk/examples/jpa/view/book.xhtml 2008-06-09 20:03:03 UTC (rev 8367)
@@ -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: trunk/examples/jpa/view/confirm.xhtml
===================================================================
--- trunk/examples/jpa/view/confirm.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
+++ trunk/examples/jpa/view/confirm.xhtml 2008-06-09 20:03:03 UTC (rev 8367)
@@ -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: trunk/examples/jpa/view/conversations.xhtml
===================================================================
--- trunk/examples/jpa/view/conversations.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
+++ trunk/examples/jpa/view/conversations.xhtml 2008-06-09 20:03:03 UTC (rev 8367)
@@ -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}"/>
 
- <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: trunk/examples/jpa/view/home.xhtml
===================================================================
--- trunk/examples/jpa/view/home.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
+++ trunk/examples/jpa/view/home.xhtml 2008-06-09 20:03:03 UTC (rev 8367)
@@ -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: trunk/examples/jpa/view/hotel.xhtml
===================================================================
--- trunk/examples/jpa/view/hotel.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
+++ trunk/examples/jpa/view/hotel.xhtml 2008-06-09 20:03:03 UTC (rev 8367)
@@ -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: trunk/examples/jpa/view/main.xhtml
===================================================================
--- trunk/examples/jpa/view/main.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
+++ trunk/examples/jpa/view/main.xhtml 2008-06-09 20:03:03 UTC (rev 8367)
@@ -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>
 
<a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/>
 
- <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> 
- <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> 
+ <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: trunk/examples/jpa/view/password.xhtml
===================================================================
--- trunk/examples/jpa/view/password.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
+++ trunk/examples/jpa/view/password.xhtml 2008-06-09 20:03:03 UTC (rev 8367)
@@ -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: trunk/examples/jpa/view/register.xhtml
===================================================================
--- trunk/examples/jpa/view/register.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
+++ trunk/examples/jpa/view/register.xhtml 2008-06-09 20:03:03 UTC (rev 8367)
@@ -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">
16 years, 6 months
Seam SVN: r8366 - trunk/examples/booking/view.
by seam-commits@lists.jboss.org
Author: stan.silvert(a)jboss.com
Date: 2008-06-09 15:49:54 -0400 (Mon, 09 Jun 2008)
New Revision: 8366
Modified:
trunk/examples/booking/view/book.xhtml
trunk/examples/booking/view/confirm.xhtml
trunk/examples/booking/view/conversations.xhtml
trunk/examples/booking/view/edit.xhtml
trunk/examples/booking/view/home.xhtml
trunk/examples/booking/view/hotelview.xhtml
trunk/examples/booking/view/main.xhtml
trunk/examples/booking/view/password.xhtml
trunk/examples/booking/view/register.xhtml
Log:
JBSEAM-3048
Modified: trunk/examples/booking/view/book.xhtml
===================================================================
--- trunk/examples/booking/view/book.xhtml 2008-06-09 18:42:12 UTC (rev 8365)
+++ trunk/examples/booking/view/book.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
@@ -15,7 +15,7 @@
</div>
<div class="section">
<div class="entry errors">
- <h:messages globalOnly="true"/>
+ <h:messages id="messages" globalOnly="true"/>
</div>
<ui:include src="hotelview.xhtml"/>
@@ -38,56 +38,56 @@
<s:decorate id="bedsDecorate" template="edit.xhtml">
<ui:define name="label">Room Preference:</ui:define>
<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>
<s:decorate id="smokingDecorate" template="edit.xhtml">
<ui:define name="label">Smoking Preference:</ui:define>
<h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection" styleClass="radio">
- <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>
<s:decorate id="creditCardDecorate" template="edit.xhtml">
<ui:define name="label">Credit Card #:</ui:define>
<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>
<s:decorate id="creditCardNameDecorate" template="edit.xhtml">
<ui:define name="label">Credit Card Name:</ui:define>
<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>
<s:decorate id="creditCardExpiryDecorate" template="edit.xhtml">
<ui:define name="label">Credit Card Expiry:</ui:define>
<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>
Modified: trunk/examples/booking/view/confirm.xhtml
===================================================================
--- trunk/examples/booking/view/confirm.xhtml 2008-06-09 18:42:12 UTC (rev 8365)
+++ trunk/examples/booking/view/confirm.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
@@ -17,24 +17,24 @@
<ui:include src="hotelview.xhtml"/>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateTotalPayment" template="display.xhtml">
<ui:define name="label">Total Payment:</ui:define>
- <h:outputText value="#{booking.total}">
+ <h:outputText id="BookingTotal" value="#{booking.total}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</s:decorate>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateCheckInDate" template="display.xhtml">
<ui:define name="label">Check In Date:</ui:define>
- <h:outputText value="#{booking.checkinDate}"/>
+ <h:outputText id="BookingCheckinDate" value="#{booking.checkinDate}"/>
</s:decorate>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateCheckoutDate" template="display.xhtml">
<ui:define name="label">Check Out Date:</ui:define>
- <h:outputText value="#{booking.checkoutDate}"/>
+ <h:outputText id="BookingCheckoutDate" value="#{booking.checkoutDate}"/>
</s:decorate>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateCreditCard" template="display.xhtml">
<ui:define name="label">Credit Card #:</ui:define>
#{booking.creditCard}
</s:decorate>
Modified: trunk/examples/booking/view/conversations.xhtml
===================================================================
--- trunk/examples/booking/view/conversations.xhtml 2008-06-09 18:42:12 UTC (rev 8365)
+++ trunk/examples/booking/view/conversations.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
@@ -12,19 +12,19 @@
</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="ConversationListForm">
+ <h:dataTable id="ConversationListDataTable" value="#{conversationList}" var="entry">
+ <h:column id="column1">
+ <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/>
 
- <h:outputText value="[current]" rendered="#{entry.current}"/>
+ <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: trunk/examples/booking/view/edit.xhtml
===================================================================
--- trunk/examples/booking/view/edit.xhtml 2008-06-09 18:42:12 UTC (rev 8365)
+++ trunk/examples/booking/view/edit.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
@@ -6,16 +6,16 @@
xmlns:s="http://jboss.com/products/seam/taglib">
<div class="entry">
- <s:label styleClass="label #{invalid?'errors':''}">
+ <s:label id="Label" styleClass="label #{invalid?'errors':''}">
<ui:insert name="label"/>
- <s:span styleClass="required" rendered="#{required}">*</s:span>
+ <s:span id="RequiredStyle" styleClass="required" rendered="#{required}">*</s:span>
</s:label>
<span class="input #{invalid?'errors':''}">
- <s:validateAll>
+ <s:validateAll id="ValidateAll">
<ui:insert/>
</s:validateAll>
</span>
- <s:message styleClass="error errors"/>
+ <s:message id="message" styleClass="error errors"/>
</div>
</ui:composition>
\ No newline at end of file
Modified: trunk/examples/booking/view/home.xhtml
===================================================================
--- trunk/examples/booking/view/home.xhtml 2008-06-09 18:42:12 UTC (rev 8365)
+++ trunk/examples/booking/view/home.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
@@ -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="UsernameMessage" 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: trunk/examples/booking/view/hotelview.xhtml
===================================================================
--- trunk/examples/booking/view/hotelview.xhtml 2008-06-09 18:42:12 UTC (rev 8365)
+++ trunk/examples/booking/view/hotelview.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
@@ -5,39 +5,39 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.com/products/seam/taglib">
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateName" template="display.xhtml">
<ui:define name="label">Name:</ui:define>
#{hotel.name}
</s:decorate>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateAddress" template="display.xhtml">
<ui:define name="label">Address:</ui:define>
#{hotel.address}
</s:decorate>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateCity" template="display.xhtml">
<ui:define name="label">City:</ui:define>
#{hotel.city}
</s:decorate>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateState" template="display.xhtml">
<ui:define name="label">State:</ui:define>
#{hotel.state}
</s:decorate>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateZip" template="display.xhtml">
<ui:define name="label">Zip:</ui:define>
#{hotel.zip}
</s:decorate>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateCountry" template="display.xhtml">
<ui:define name="label">Country:</ui:define>
#{hotel.country}
</s:decorate>
- <s:decorate template="display.xhtml">
+ <s:decorate id="DecorateNightlyRate" template="display.xhtml">
<ui:define name="label">Nightly rate:</ui:define>
- <h:outputText value="#{hotel.price}">
+ <h:outputText id="HotelPrice" value="#{hotel.price}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</s:decorate>
Modified: trunk/examples/booking/view/main.xhtml
===================================================================
--- trunk/examples/booking/view/main.xhtml 2008-06-09 18:42:12 UTC (rev 8365)
+++ trunk/examples/booking/view/main.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
@@ -13,7 +13,7 @@
<div class="section">
<span class="errors">
- <h:messages globalOnly="true"/>
+ <h:messages id="messages" globalOnly="true"/>
</span>
<h1>Search Hotels</h1>
@@ -21,22 +21,22 @@
<h:form id="searchCriteria">
<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>
 
<a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/>
 
- <a:status>
- <f:facet name="start">
- <h:graphicImage value="/img/spinner.gif"/>
+ <a:status id="status">
+ <f:facet id="StartStatus" name="start">
+ <h:graphicImage id="SpinnerGif" value="/img/spinner.gif"/>
</f:facet>
</a:status>
<br/>
- <h:outputLabel for="pageSize">Maximum results:</h:outputLabel> 
- <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> 
+ <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>
</h:form>
@@ -45,30 +45,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>
@@ -77,34 +77,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: trunk/examples/booking/view/password.xhtml
===================================================================
--- trunk/examples/booking/view/password.xhtml 2008-06-09 18:42:12 UTC (rev 8365)
+++ trunk/examples/booking/view/password.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
@@ -16,19 +16,19 @@
<div class="section">
<div class="entry errors">
- <h:messages globalOnly="true"/>
+ <h:messages id="messages" globalOnly="true"/>
</div>
<h:form id="setpassword">
<fieldset>
- <s:decorate template="edit.xhtml">
+ <s:decorate id="PasswordDecorate" template="edit.xhtml">
<ui:define name="label">Password:</ui:define>
<h:inputSecret id="password" value="#{user.password}" required="true"/>
</s:decorate>
- <s:decorate template="edit.xhtml">
+ <s:decorate id="VerifyDecorate" template="edit.xhtml">
<ui:define name="label">Verify:</ui:define>
<h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/>
</s:decorate>
Modified: trunk/examples/booking/view/register.xhtml
===================================================================
--- trunk/examples/booking/view/register.xhtml 2008-06-09 18:42:12 UTC (rev 8365)
+++ trunk/examples/booking/view/register.xhtml 2008-06-09 19:49:54 UTC (rev 8366)
@@ -48,7 +48,7 @@
<div class="section">
<div class="entry errors">
- <h:messages globalOnly="true"/>
+ <h:messages id="messages" globalOnly="true"/>
</div>
<h:form id="registration">
@@ -57,14 +57,14 @@
<s:decorate id="usernameDecorate" template="edit.xhtml">
<ui:define name="label">Username:</ui:define>
<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>
<s:decorate id="nameDecorate" template="edit.xhtml">
<ui:define name="label">Real Name:</ui:define>
<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>
16 years, 6 months
Seam SVN: r8365 - branches/Seam_2_0/examples/jpa.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-06-09 14:42:12 -0400 (Mon, 09 Jun 2008)
New Revision: 8365
Modified:
branches/Seam_2_0/examples/jpa/build.xml
Log:
port of JBSEAM-2833
Modified: branches/Seam_2_0/examples/jpa/build.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build.xml 2008-06-09 18:18:26 UTC (rev 8364)
+++ branches/Seam_2_0/examples/jpa/build.xml 2008-06-09 18:42:12 UTC (rev 8365)
@@ -25,6 +25,10 @@
<target name="weblogic92" description="Build the JPA artifacts, suitable for deployment to WebLogic 9.2">
<ant antfile="build-weblogic92.xml"/>
</target>
+
+ <target name="weblogic10" description="Build the JPA artifacts, suitable for deployment to WebLogic 10">
+ <ant antfile="build-weblogic10.xml"/>
+ </target>
<target name="websphere61" description="Build the JPA artifacts, suitable for deployment to WebSphere 6.1.0.13 + EJB3 FP">
<ant antfile="build-websphere61.xml"/>
@@ -43,13 +47,14 @@
<ant antfile="build-jboss405.xml" target="clean" />
<ant antfile="build-glassfish.xml" target="clean" />
<ant antfile="build-weblogic92.xml" target="clean" />
+ <ant antfile="build-weblogic10.xml" target="clean" />
<ant antfile="build-websphere61.xml" target="clean" />
<ant antfile="build-tomcat55.xml" target="clean" />
<ant antfile="build-tomcat6.xml" target="clean" />
<ant antfile="build-jboss-embedded.xml" target="clean" />
</target>
- <target name="all" depends="jboss, jboss405, glassfish, weblogic92, websphere61, tomcat55, tomcat6"/>
+ <target name="all" depends="jboss, jboss405, glassfish, weblogic92, weblogic10, websphere61, tomcat55, tomcat6"/>
<target name="test">
<ant antfile="build-jboss.xml" target="test" />
16 years, 6 months
Seam SVN: r8364 - in trunk: doc/Seam_Reference_Guide/en-US and 4 other directories.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-06-09 14:18:26 -0400 (Mon, 09 Jun 2008)
New Revision: 8364
Modified:
trunk/build/core.pom.xml
trunk/build/root.pom.xml
trunk/doc/Seam_Reference_Guide/en-US/Oc4j.xml
trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml
trunk/doc/Seam_Reference_Guide/en-US/Websphere.xml
trunk/examples/build.xml
trunk/examples/hibernate/build-glassfish.xml
trunk/examples/jpa/build-glassfish.xml
trunk/examples/jpa/build.xml
trunk/seam-gen/build.xml
Log:
port of JBSEAM-2833 to trunk
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/build/core.pom.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -306,6 +306,12 @@
<artifactId>jboss-vfs</artifactId>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/build/root.pom.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -783,6 +783,12 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<version>2.0.0.Beta11</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -790,6 +796,12 @@
<artifactId>jboss-common-logging-spi</artifactId>
<version>2.0.4.GA</version>
</dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.0.4.GA</version>
+ </dependency>
<dependency>
<groupId>com.lowagie</groupId>
Modified: trunk/doc/Seam_Reference_Guide/en-US/Oc4j.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Oc4j.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/doc/Seam_Reference_Guide/en-US/Oc4j.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -199,6 +199,11 @@
</simpara>
</listitem>
<listitem>
+ <simpara>
+ <literal>concurrent.jar</literal>
+ </simpara>
+ </listitem>
+ <listitem>
<simpara><literal>log4j.jar</literal>
— This can be left out if you are not going
to configure log4j. If it is packaged but not
@@ -915,6 +920,7 @@
<include name="lib/asm.jar"/>
<include name="lib/commons-beanutils.jar"/>
<include name="lib/commons-digester.jar"/>
+<include name="lib/concurrent.jar"/>
<include name="lib/antlr.jar"/>]]></programlisting>
</listitem>
</itemizedlist>
@@ -950,6 +956,7 @@
<include name="lib/asm.jar"/>
<include name="lib/commons-beanutils.jar"/>
<include name="lib/commons-digester.jar"/>
+ <include name="lib/concurrent.jar"/>
<include name="lib/antlr.jar"/>
</fileset>]]></programlisting>
</section>
Modified: trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -823,20 +823,7 @@
<include name="*.cfg.xml" />
<include name="*.xsd" />
</fileset>]]></programlisting>
- </listitem>
- <listitem>
- <para>
- Then finally we need to add two jars to
- the
- <literal>EAR</literal>
- . Add these two lines to the
- <literal>ear.lib.extras</literal>
- fileset.
- </para>
- <programlisting role="XML"><![CDATA[
- <include name="examples/wiki/lib/jboss-archive-browsing.jar" />
- <include name="lib/concurrent.jar" />]]></programlisting>
- </listitem>
+ </listitem>
</itemizedlist>
</listitem>
</varlistentry>
@@ -985,7 +972,7 @@
command:
<programlisting>
- ant -f build-weblogic10.xml
+ ant weblogic10.xml
</programlisting>
This will create a container specific distribution and
exploded archive directories.
@@ -1162,7 +1149,7 @@
</listitem>
<listitem>
<simpara>
- <literal>jboss-archive-browsing.jar</literal>
+ <literal>jboss-common-core.jar</literal>
</simpara>
</listitem>
</itemizedlist>
@@ -1202,6 +1189,11 @@
<literal>javassist.jar</literal>
</simpara>
</listitem>
+ <listitem>
+ <simpara>
+ <literal>concurrent.jar</literal>
+ </simpara>
+ </listitem>
</itemizedlist>
</listitem>
</itemizedlist>
@@ -1477,23 +1469,7 @@
application.</para>
<itemizedlist>
-
<listitem>
- <para>Missing jar — There is one library that
- <literal>seam-gen</literal> does not provide by
- default. This needs to be copied into your projects
- <literal>/lib</literal> directory manually.
- </para>
- <itemizedlist>
- <listitem>
- <para>jboss-archive-browsing.jar — can
- be found in the
- <literal>@SEAM_DIST/examples/wiki/lib</literal>
- directory. </para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
<para>build.xml — Now we need to adjust the
<literal>build.xml</literal>. Find the target
<literal>war</literal> and add the following to the end
@@ -1514,7 +1490,8 @@
<include name="hibernate-annotations.jar" />
<include name="hibernate-entitymanager.jar" />
<include name="hibernate-validator.jar" />
- <include name="jboss-archive-browsing.jar" />
+ <include name="jboss-common-core.jar" />
+ <include name="concurrent.jar" />
</fileset>
</copy>]]></programlisting>
</listitem>
Modified: trunk/doc/Seam_Reference_Guide/en-US/Websphere.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Websphere.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/doc/Seam_Reference_Guide/en-US/Websphere.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -897,7 +897,7 @@
</listitem>
<listitem>
<simpara>
- <literal>jboss-archive-browsing.jar</literal>
+ <literal>jboss-common-core.jar</literal>
</simpara>
</listitem>
</itemizedlist> </para>
@@ -951,6 +951,11 @@
<literal>javassist.jar</literal>
</simpara>
</listitem>
+ <listitem>
+ <simpara>
+ <literal>concurrent.jar</literal>
+ </simpara>
+ </listitem>
</itemizedlist> </para>
</listitem>
</itemizedlist> </para>
@@ -1433,19 +1438,12 @@
<include name="lib/el-ri.jar"/>]]></programlisting>
</listitem>
<listitem>
- <para> Third party dependencies. You will need to copy the
- <literal>jboss-archive-browsing.jar</literal> from the
- <literal>$SEAM/examples/jpa/lib</literal> directory into the
- the projects <literal>/lib</literal> directory. You will
- also need to acquire the <literal>concurrent.jar</literal>
- and place it in the same directory. You can get this from
- any jboss distribution or just search for it.</para>
+ <para> Third party dependencies.</para>
<programlisting role="XML"><![CDATA[
<!-- 3rd party and supporting jars -->
<!--<include name="lib/log4j.jar" />-->
<include name="lib/javassist.jar"/>
<include name="lib/dom4j.jar" />
- <include name="lib/jboss-archive-browsing.jar" />
<include name="lib/concurrent.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
@@ -1494,7 +1492,6 @@
<!--<include name="lib/log4j.jar" />-->
<include name="lib/javassist.jar"/>
<include name="lib/dom4j.jar" />
- <include name="lib/jboss-archive-browsing.jar" />
<include name="lib/concurrent.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/examples/build.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -331,6 +331,7 @@
<fileset id="jboss-common-core.jar" dir="${lib.dir}">
<include name="jboss-common-core.jar" if="jboss-common-core.lib" />
+ <include name="concurrent.jar" if="jboss-common-core.lib" />
</fileset>
<!-- ############################ MELDWARE ############################ -->
@@ -500,7 +501,7 @@
<mkdir dir="${dist.dir}" />
</target>
- <target name="copyextradependencies" depends="gettrinidad, getelri, getjbosscommoncore"/>
+ <target name="copyextradependencies" depends="gettrinidad, getelri"/>
<target name="gettrinidad" if="trinidad.lib">
<copyInlineDependencies id="trinidad" scope="runtime" todir="${lib.dir}">
@@ -528,18 +529,6 @@
<dependency groupId="javax.el" artifactId="el-ri" version="1.2" />
</copyInlineDependencies>
</target>
-
- <target name="getjbosscommoncore" if="jboss-common-core.lib">
- <copyInlineDependencies id="jbosscommoncore" scope="runtime" todir="${lib.dir}">
- <dependency groupId="jboss" artifactId="jboss-common-core" version="2.0.2.GA">
- <exclusion groupId="apache-xerces" artifactId="xml-apis" />
- <exclusion groupId="apache-httpclient" artifactId="commons-httpclient" />
- <exclusion groupId="oswego-concurrent" artifactId="concurrent" />
- <exclusion groupId="apache-slide" artifactId="webdavlib" />
- <exclusion groupId="jboss" artifactId="jboss-logging-spi" />
- </dependency>
- </copyInlineDependencies>
- </target>
<!-- Use the Eclipse compiler, if it is available -->
<target name="select-compiler">
Modified: trunk/examples/hibernate/build-glassfish.xml
===================================================================
--- trunk/examples/hibernate/build-glassfish.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/examples/hibernate/build-glassfish.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -33,7 +33,6 @@
<include name="lib/hibernate-validator.jar"/>
<include name="lib/asm.jar" />
- <include name="lib/jboss-common-core.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/antlr.jar" />
<include name="lib/commons-logging.jar" />
Modified: trunk/examples/jpa/build-glassfish.xml
===================================================================
--- trunk/examples/jpa/build-glassfish.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/examples/jpa/build-glassfish.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -32,7 +32,6 @@
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
<include name="lib/asm.jar" />
- <include name="lib/jboss-common-core.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/antlr.jar" />
<include name="lib/commons-logging.jar" />
Modified: trunk/examples/jpa/build.xml
===================================================================
--- trunk/examples/jpa/build.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/examples/jpa/build.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -25,6 +25,10 @@
<target name="weblogic92" description="Build the JPA artifacts, suitable for deployment to WebLogic 9.2">
<ant antfile="build-weblogic92.xml"/>
</target>
+
+ <target name="weblogic10" description="Build the JPA artifacts, suitable for deployment to WebLogic 10">
+ <ant antfile="build-weblogic10.xml"/>
+ </target>
<target name="websphere61" description="Build the JPA artifacts, suitable for deployment to WebSphere 6.1.0.13 + EJB3 FP">
<ant antfile="build-websphere61.xml"/>
@@ -43,13 +47,14 @@
<ant antfile="build-jboss405.xml" target="clean" />
<ant antfile="build-glassfish.xml" target="clean" />
<ant antfile="build-weblogic92.xml" target="clean" />
+ <ant antfile="build-weblogic10.xml" target="clean" />
<ant antfile="build-websphere61.xml" target="clean" />
<ant antfile="build-tomcat55.xml" target="clean" />
<ant antfile="build-tomcat6.xml" target="clean" />
<ant antfile="build-jboss-embedded.xml" target="clean" />
</target>
- <target name="all" depends="jboss, jboss405, glassfish, weblogic92, websphere61, tomcat55, tomcat6"/>
+ <target name="all" depends="jboss, jboss405, glassfish, weblogic92,weblogic10, websphere61, tomcat55, tomcat6"/>
<target name="test">
<ant antfile="build-jboss.xml" target="test" />
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-06-09 18:17:03 UTC (rev 8363)
+++ trunk/seam-gen/build.xml 2008-06-09 18:18:26 UTC (rev 8364)
@@ -1079,6 +1079,7 @@
<pathelement path="../lib/asm.jar" />
<pathelement path="../lib/core.jar" />
<pathelement path="../lib/jboss-common-core.jar" />
+ <pathelement path="../lib/concurrent.jar"/>
<pathelement path="${driver.jar}"/>
<pathelement path="../lib/jboss-seam-gen.jar"/>
</path>
16 years, 6 months
Seam SVN: r8363 - trunk.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-06-09 14:17:03 -0400 (Mon, 09 Jun 2008)
New Revision: 8363
Modified:
trunk/build.xml
Log:
port of JBSEAM-3072
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-06-09 17:53:27 UTC (rev 8362)
+++ trunk/build.xml 2008-06-09 18:17:03 UTC (rev 8363)
@@ -577,6 +577,11 @@
<copy file="seam-text.g" todir="${dist.dir}" />
<copy file="seam.bat" todir="${dist.dir}" />
<copy file="seam2migration.txt" todir="${dist.dir}" />
+ <copy todir="${dist.dir}/extras">
+ <fileset dir="${basedir}/extras">
+ <include name="**/*" />
+ </fileset>
+ </copy>
<replace file="${dist.dir}/build.xml">
<replacetoken>
<![CDATA[${name}-${complete.version}]]>
16 years, 6 months
Seam SVN: r8362 - in trunk/src/main/org/jboss/seam: navigation and 1 other directory.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2008-06-09 13:53:27 -0400 (Mon, 09 Jun 2008)
New Revision: 8362
Modified:
trunk/src/main/org/jboss/seam/core/ConversationPropagation.java
trunk/src/main/org/jboss/seam/navigation/NaturalConversationIdParameter.java
Log:
JBSEAM-3053
Modified: trunk/src/main/org/jboss/seam/core/ConversationPropagation.java
===================================================================
--- trunk/src/main/org/jboss/seam/core/ConversationPropagation.java 2008-06-09 17:52:47 UTC (rev 8361)
+++ trunk/src/main/org/jboss/seam/core/ConversationPropagation.java 2008-06-09 17:53:27 UTC (rev 8362)
@@ -117,11 +117,9 @@
}
// Try to restore the conversation from parameters (the user has specified the exact conversation to restore using f:param)
conversationId = currentConversationIdParameter.getRequestConversationId(parameters);
- if (conversationId == null)
- {
- // Try to restore the conversation from the EL expression on the conversation definition
- conversationId = currentConversationIdParameter.getConversationId();
- }
+
+ // NOTE: If conversationId is still null, don't try to resolve the EL here because we don't yet
+ // have a conversation and therefore things may blow up; resolve EL in getInitialConversationId()
}
else
{
Modified: trunk/src/main/org/jboss/seam/navigation/NaturalConversationIdParameter.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/NaturalConversationIdParameter.java 2008-06-09 17:52:47 UTC (rev 8361)
+++ trunk/src/main/org/jboss/seam/navigation/NaturalConversationIdParameter.java 2008-06-09 17:53:27 UTC (rev 8362)
@@ -42,7 +42,7 @@
public String getInitialConversationId(Map parameters)
{
String id = getRequestConversationId(parameters);
- return id==null ? Id.nextId() : id; //TODO: should we try using the expression?
+ return id==null ? getConversationId() : id;
}
public String getRequestConversationId(Map parameters)
16 years, 6 months
Seam SVN: r8361 - in branches/Seam_2_0/src/main/org/jboss/seam: navigation and 1 other directory.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2008-06-09 13:52:47 -0400 (Mon, 09 Jun 2008)
New Revision: 8361
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/core/ConversationPropagation.java
branches/Seam_2_0/src/main/org/jboss/seam/navigation/ELConversationIdParameter.java
Log:
JBSEAM-3053
Modified: branches/Seam_2_0/src/main/org/jboss/seam/core/ConversationPropagation.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/core/ConversationPropagation.java 2008-06-09 17:22:02 UTC (rev 8360)
+++ branches/Seam_2_0/src/main/org/jboss/seam/core/ConversationPropagation.java 2008-06-09 17:52:47 UTC (rev 8361)
@@ -117,11 +117,9 @@
}
// Try to restore the conversation from parameters (the user has specified the exact conversation to restore using f:param)
conversationId = currentConversationIdParameter.getRequestConversationId(parameters);
- if (conversationId == null)
- {
- // Try to restore the conversation from the EL expression on the conversation definition
- conversationId = currentConversationIdParameter.getConversationId();
- }
+
+ // NOTE: If conversationId is still null, don't try to resolve the EL here because we don't yet
+ // have a conversation and therefore things may blow up; resolve EL in getInitialConversationId()
}
else
{
Modified: branches/Seam_2_0/src/main/org/jboss/seam/navigation/ELConversationIdParameter.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/navigation/ELConversationIdParameter.java 2008-06-09 17:22:02 UTC (rev 8360)
+++ branches/Seam_2_0/src/main/org/jboss/seam/navigation/ELConversationIdParameter.java 2008-06-09 17:52:47 UTC (rev 8361)
@@ -42,7 +42,7 @@
public String getInitialConversationId(Map parameters)
{
String id = getRequestConversationId(parameters);
- return id==null ? Id.nextId() : id; //TODO: should we try using the expression?
+ return id == null ? getConversationId() : id;
}
public String getRequestConversationId(Map parameters)
16 years, 6 months
Seam SVN: r8360 - in branches/Seam_2_0: doc/Seam_Reference_Guide/en-US and 4 other directories.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-06-09 13:22:02 -0400 (Mon, 09 Jun 2008)
New Revision: 8360
Modified:
branches/Seam_2_0/build/root.pom.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Oc4j.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Weblogic.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Websphere.xml
branches/Seam_2_0/examples/build.xml
branches/Seam_2_0/examples/hibernate/build-glassfish.xml
branches/Seam_2_0/examples/hibernate/build-websphere61.xml
branches/Seam_2_0/examples/jpa/build-glassfish.xml
branches/Seam_2_0/seam-gen/build.xml
Log:
JBSEAM-2833 - updated handling of jboss-common-core.jar and concurrent.jar. This also included updating the interop reference guides to match, and the changing some of the example build files to remove duplicate entries.
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/build/root.pom.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -713,6 +713,12 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<version>2.0.0.Beta11</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Oc4j.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Oc4j.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Oc4j.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -199,6 +199,11 @@
</simpara>
</listitem>
<listitem>
+ <simpara>
+ <literal>concurrent.jar</literal>
+ </simpara>
+ </listitem>
+ <listitem>
<simpara><literal>log4j.jar</literal>
— This can be left out if you are not going
to configure log4j. If it is packaged but not
@@ -915,6 +920,7 @@
<include name="lib/asm.jar"/>
<include name="lib/commons-beanutils.jar"/>
<include name="lib/commons-digester.jar"/>
+<include name="lib/concurrent.jar"/>
<include name="lib/antlr.jar"/>]]></programlisting>
</listitem>
</itemizedlist>
@@ -950,6 +956,7 @@
<include name="lib/asm.jar"/>
<include name="lib/commons-beanutils.jar"/>
<include name="lib/commons-digester.jar"/>
+ <include name="lib/concurrent.jar"/>
<include name="lib/antlr.jar"/>
</fileset>]]></programlisting>
</section>
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Weblogic.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -823,20 +823,7 @@
<include name="*.cfg.xml" />
<include name="*.xsd" />
</fileset>]]></programlisting>
- </listitem>
- <listitem>
- <para>
- Then finally we need to add two jars to
- the
- <literal>EAR</literal>
- . Add these two lines to the
- <literal>ear.lib.extras</literal>
- fileset.
- </para>
- <programlisting role="XML"><![CDATA[
- <include name="examples/wiki/lib/jboss-archive-browsing.jar" />
- <include name="lib/concurrent.jar" />]]></programlisting>
- </listitem>
+ </listitem>
</itemizedlist>
</listitem>
</varlistentry>
@@ -985,7 +972,7 @@
command:
<programlisting>
- ant -f build-weblogic10.xml
+ ant weblogic10.xml
</programlisting>
This will create a container specific distribution and
exploded archive directories.
@@ -1162,7 +1149,7 @@
</listitem>
<listitem>
<simpara>
- <literal>jboss-archive-browsing.jar</literal>
+ <literal>jboss-common-core.jar</literal>
</simpara>
</listitem>
</itemizedlist>
@@ -1202,6 +1189,11 @@
<literal>javassist.jar</literal>
</simpara>
</listitem>
+ <listitem>
+ <simpara>
+ <literal>concurrent.jar</literal>
+ </simpara>
+ </listitem>
</itemizedlist>
</listitem>
</itemizedlist>
@@ -1477,23 +1469,7 @@
application.</para>
<itemizedlist>
-
<listitem>
- <para>Missing jar — There is one library that
- <literal>seam-gen</literal> does not provide by
- default. This needs to be copied into your projects
- <literal>/lib</literal> directory manually.
- </para>
- <itemizedlist>
- <listitem>
- <para>jboss-archive-browsing.jar — can
- be found in the
- <literal>@SEAM_DIST/examples/wiki/lib</literal>
- directory. </para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
<para>build.xml — Now we need to adjust the
<literal>build.xml</literal>. Find the target
<literal>war</literal> and add the following to the end
@@ -1514,7 +1490,8 @@
<include name="hibernate-annotations.jar" />
<include name="hibernate-entitymanager.jar" />
<include name="hibernate-validator.jar" />
- <include name="jboss-archive-browsing.jar" />
+ <include name="jboss-common-core.jar" />
+ <include name="concurrent.jar" />
</fileset>
</copy>]]></programlisting>
</listitem>
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Websphere.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Websphere.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Websphere.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -897,7 +897,7 @@
</listitem>
<listitem>
<simpara>
- <literal>jboss-archive-browsing.jar</literal>
+ <literal>jboss-common-core.jar</literal>
</simpara>
</listitem>
</itemizedlist> </para>
@@ -951,6 +951,11 @@
<literal>javassist.jar</literal>
</simpara>
</listitem>
+ <listitem>
+ <simpara>
+ <literal>concurrent.jar</literal>
+ </simpara>
+ </listitem>
</itemizedlist> </para>
</listitem>
</itemizedlist> </para>
@@ -1433,19 +1438,12 @@
<include name="lib/el-ri.jar"/>]]></programlisting>
</listitem>
<listitem>
- <para> Third party dependencies. You will need to copy the
- <literal>jboss-archive-browsing.jar</literal> from the
- <literal>$SEAM/examples/jpa/lib</literal> directory into the
- the projects <literal>/lib</literal> directory. You will
- also need to acquire the <literal>concurrent.jar</literal>
- and place it in the same directory. You can get this from
- any jboss distribution or just search for it.</para>
+ <para> Third party dependencies.</para>
<programlisting role="XML"><![CDATA[
<!-- 3rd party and supporting jars -->
<!--<include name="lib/log4j.jar" />-->
<include name="lib/javassist.jar"/>
<include name="lib/dom4j.jar" />
- <include name="lib/jboss-archive-browsing.jar" />
<include name="lib/concurrent.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
@@ -1494,7 +1492,6 @@
<!--<include name="lib/log4j.jar" />-->
<include name="lib/javassist.jar"/>
<include name="lib/dom4j.jar" />
- <include name="lib/jboss-archive-browsing.jar" />
<include name="lib/concurrent.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
Modified: branches/Seam_2_0/examples/build.xml
===================================================================
--- branches/Seam_2_0/examples/build.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/examples/build.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -310,6 +310,7 @@
<fileset id="jboss-common-core.jar" dir="${lib.dir}">
<include name="jboss-common-core.jar" if="jboss-common-core.lib" />
+ <include name="concurrent.jar" if="jboss-common-core.lib" />
</fileset>
<!-- ############################ MELDWARE ############################ -->
@@ -472,7 +473,7 @@
<mkdir dir="${dist.dir}" />
</target>
- <target name="copyextradependencies" depends="gettrinidad, getelri, getjbosscommoncore"/>
+ <target name="copyextradependencies" depends="gettrinidad, getelri"/>
<target name="gettrinidad" if="trinidad.lib">
<copyInlineDependencies id="trinidad" scope="runtime" todir="${lib.dir}">
@@ -500,18 +501,6 @@
<dependency groupId="javax.el" artifactId="el-ri" version="1.2" />
</copyInlineDependencies>
</target>
-
- <target name="getjbosscommoncore" if="jboss-common-core.lib">
- <copyInlineDependencies id="jbosscommoncore" scope="runtime" todir="${lib.dir}">
- <dependency groupId="jboss" artifactId="jboss-common-core" version="2.0.2.GA">
- <exclusion groupId="apache-xerces" artifactId="xml-apis" />
- <exclusion groupId="apache-httpclient" artifactId="commons-httpclient" />
- <exclusion groupId="oswego-concurrent" artifactId="concurrent" />
- <exclusion groupId="apache-slide" artifactId="webdavlib" />
- <exclusion groupId="jboss" artifactId="jboss-logging-spi" />
- </dependency>
- </copyInlineDependencies>
- </target>
<!-- Use the Eclipse compiler, if it is available -->
<target name="select-compiler">
Modified: branches/Seam_2_0/examples/hibernate/build-glassfish.xml
===================================================================
--- branches/Seam_2_0/examples/hibernate/build-glassfish.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/examples/hibernate/build-glassfish.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -33,7 +33,6 @@
<include name="lib/hibernate-validator.jar"/>
<include name="lib/asm.jar" />
- <include name="lib/jboss-common-core.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/antlr.jar" />
<include name="lib/commons-logging.jar" />
Modified: branches/Seam_2_0/examples/hibernate/build-websphere61.xml
===================================================================
--- branches/Seam_2_0/examples/hibernate/build-websphere61.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/examples/hibernate/build-websphere61.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -29,7 +29,8 @@
<!-- Misc -->
<include name="lib/commons-beanutils.jar"/>
<include name="lib/commons-digester.jar"/>
- <include name="lib/commons-collections.jar"/>
+ <include name="lib/commons-collections.jar"/>
+
<!-- JSF (and related) implementation -->
<include name="lib/jsf-api.jar"/>
<include name="lib/jsf-impl.jar"/>
Modified: branches/Seam_2_0/examples/jpa/build-glassfish.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build-glassfish.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/examples/jpa/build-glassfish.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -32,7 +32,6 @@
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
<include name="lib/asm.jar" />
- <include name="lib/jboss-common-core.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/antlr.jar" />
<include name="lib/commons-logging.jar" />
Modified: branches/Seam_2_0/seam-gen/build.xml
===================================================================
--- branches/Seam_2_0/seam-gen/build.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/seam-gen/build.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -1079,6 +1079,7 @@
<pathelement path="../lib/asm.jar" />
<pathelement path="../lib/core.jar" />
<pathelement path="../lib/jboss-common-core.jar" />
+ <pathelement path="../lib/concurrent.jar"/>
<pathelement path="${driver.jar}"/>
<pathelement path="../lib/jboss-seam-gen.jar"/>
</path>
16 years, 6 months