From 62ddcb31fab2dc237ac70f9f889c0c034e47d2aa Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 27 Mar 2008 12:19:39 +0000
Subject: [PATCH]

---
 .../samples/booking/HotelsController.java      | 15 ++++++++++++++-
 .../main/webapp/WEB-INF/layouts/standard.jsp   |  4 ++--
 .../webapp/WEB-INF/web-application-config.xml  | 18 +++++++++++-------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java
index 56847828..32317ac5 100644
--- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java
+++ b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java
@@ -1,5 +1,6 @@
 package org.springframework.webflow.samples.booking;
 
+import java.security.Principal;
 import java.util.List;
 
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -15,7 +16,13 @@ public class HotelsController {
     }
 
     @RequestMapping(method = RequestMethod.GET)
-    public void index(SearchCriteria searchCriteria) {
+    @ModelAttribute("bookings")
+    public List<Booking> index(SearchCriteria searchCriteria, Principal currentUser) {
+	if (currentUser != null) {
+	    return bookingService.findBookings(currentUser.getName());
+	} else {
+	    return null;
+	}
     }
 
     @RequestMapping
@@ -29,4 +36,10 @@ public class HotelsController {
 	return bookingService.findHotelById(id);
     }
 
+    @RequestMapping(method = RequestMethod.GET)
+    public String deleteBooking(@RequestParam("id") Long id) {
+	bookingService.cancelBooking(id);
+	return "redirect:index";
+    }
+
 }
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
index f84ba105..5eef53a4 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
@@ -23,8 +23,8 @@
 			<div class="left">Spring Travel: Spring MVC and Web Flow Reference Application</div>
 			<div class="right">
 				<security:authorize ifAllGranted="ROLE_USER">
-					<c:if test="${not empty currentUser}">
-						Welcome, ${currentUser.name} |
+					<c:if test="${pageContext.request.userPrincipal != null}">
+						Welcome, ${pageContext.request.userPrincipal.name} |
 					</c:if>
 					<a href="<c:url value="/spring/logout" />">Logout</a>
 				</security:authorize>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/web-application-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/web-application-config.xml
index 25d24544..d194171d 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/web-application-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/web-application-config.xml
@@ -23,25 +23,29 @@
 			</value>
 		</property>
 		<property name="defaultHandler">
-			<!-- Handles requests mapped directly to facelet .xhtml view templates -->	
+			<!-- Handles requests mapped directly to view templates -->	
 			<bean class="org.springframework.web.servlet.mvc.UrlFilenameViewController" />
 		</property>
 	</bean>
 
-	<!-- Handles requests to search hotels and display hotel details -->
+	<!-- Handles requests to search hotels, display hotel details, and cancel hotel bookings -->
 	<bean id="hotelsController" class="org.springframework.webflow.samples.booking.HotelsController">
-		<constructor-arg ref="bookingService"/>
+		<constructor-arg ref="bookingService" />
 	</bean>
 
-	<!-- Controls access to the booking flow -->
+	<!-- Controls access to the hotel booking flow -->
 	<bean id="bookingFlowHandler" class="org.springframework.webflow.samples.booking.BookingFlowHandler" />
 	
-	<!-- Handles requests mapped to the Web Flow handlers -->
+	<!-- Enables annotated POJO @Controllers -->
+	<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" />
+
+	<!-- Enables plain Controllers -->
+	<bean class="org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter" />
+
+	<!-- Enables FlowHandlers -->
 	<bean class="org.springframework.webflow.mvc.FlowHandlerAdapter">
 		<constructor-arg ref="flowExecutor" />
 	</bean>
-
-	<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"/>
 	
 	<!-- Executes flows: the central entry point into the Spring Web Flow system -->	
 	<web:flow-executor id="flowExecutor" flow-registry="flowRegistry">