Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing expression delimiters from the flow definitions.

Browse Source 
Making the spring-security login stuff work.
This commit is contained in:
Jeremy Grelle
2008-03-06 22:27:50 +00:00
parent c564776549
commit 001e9cea7b
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml
View File

@@ -7,17 +7,17 @@
<persistence-context/>
<input name="#{id}" value="#{flowScope.id}"/>
<input name="id" value="flowScope.id"/>
<on-start>
<evaluate expression="#{bookingService.findHotelById(id)}" result="#{flowScope.hotel}" />
<evaluate expression="${hotel.createBooking(bookingService.findUser(currentUser.name))}" result="${flowScope.booking}" />
<evaluate expression="#{entityManager.persist(booking)}" />
<evaluate expression="bookingService.findHotelById(id)" result="flowScope.hotel" />
<evaluate expression="hotel.createBooking(bookingService.findUser(currentUser.name))" result="flowScope.booking" />
<evaluate expression="entityManager.persist(booking)" />
</on-start>
<view-state id="enterBookingDetails">
<transition on="proceed" to="reviewBooking">
<evaluate expression="#{booking.validate(messageContext)}" />
<evaluate expression="booking.validate(messageContext)" />
</transition>
<transition on="cancel" to="bookingCancelled" />
</view-state>

14
spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml
View File

@@ -7,24 +7,24 @@
<view-state id="enterSearchCriteria">
<on-render>
<evaluate expression="#{bookingService.findBookings(currentUser.name)}" result="#{flowScope.bookings}" result-type="dataModel" />
<evaluate expression="bookingService.findBookings(currentUser.name)" result="flowScope.bookings" result-type="dataModel" />
</on-render>
<transition on="search" to="reviewHotels" />
<transition on="cancelBooking">
<evaluate expression="#{bookingService.cancelBooking(bookings.selectedRow)}" />
<evaluate expression="bookingService.cancelBooking(bookings.selectedRow)" />
</transition>
</view-state>
<view-state id="reviewHotels">
<on-render>
<evaluate expression="#{bookingService.findHotels(searchCriteria)}" result="#{flowScope.hotels}" result-type="dataModel" />
<evaluate expression="bookingService.findHotels(searchCriteria)" result="flowScope.hotels" result-type="dataModel" />
</on-render>
<transition on="previous">
<evaluate expression="#{searchCriteria.previousPage()}" />
<evaluate expression="searchCriteria.previousPage()" />
<render fragments="searchResultsFragment" />
</transition>
<transition on="next">
<evaluate expression="#{searchCriteria.nextPage()}" />
<evaluate expression="searchCriteria.nextPage()" />
<render fragments="searchResultsFragment" />
</transition>
<transition on="select" to="reviewHotel" />
@@ -33,14 +33,14 @@
<view-state id="reviewHotel">
<on-render>
<set name="#{requestScope.hotel}" value="#{hotels.selectedRow}" />
<set name="requestScope.hotel" value="hotels.selectedRow" />
</on-render>
<transition on="book" to="bookHotel" />
<transition on="cancel" to="enterSearchCriteria" />
</view-state>
<subflow-state id="bookHotel" subflow="booking">
<input name="#{id}" value="#{hotels.selectedRow.id}" />
<input name="id" value="hotels.selectedRow.id" />
<transition on="bookingConfirmed" to="finish" />
<transition on="bookingCancelled" to="enterSearchCriteria" />
</subflow-state>

13
spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml
View File

@@ -44,13 +44,18 @@
</div>
</div>
<!--This is here only to get state saving to run -->
<h:form id="stateWriter"> </h:form>
<div class="section">
<h:form id="hotel">
<!--This is a temporary workaround as spring-security 2.0-M2 is not forwarding to the correct URL when using a POST -->
<form id="hotel" method="GET">
<input name="execution" type="hidden" value="${requestContext.flowExecutionContext.key}"/>
<fieldset class="buttonGroup">
<h:commandButton id="book" action="book" value="Book Hotel"/>
<h:commandButton id="cancel" action="cancel" value="Back to Search"/>
<sf:commandButton id="book" ajaxEnabled="false" action="book" value="Book Hotel"/>
<sf:commandButton id="cancel" ajaxEnabled="false" action="cancel" value="Back to Search"/>
</fieldset>
</h:form>
</form>
</div>
</ui:define>