From 6942b0e0922fb91a56fc255182242cfff2deda23 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Tue, 30 Oct 2007 00:52:34 +0000
Subject: [PATCH] mvc embedded support

---
 .../WEB-INF/config/web-application-config.xml | 24 +++++++++++++++++--
 .../booking-mvc/src/main/webapp/index.html    |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
index 31325703..ac44ad53 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
@@ -11,7 +11,18 @@
 	<!-- Imports the "application-layer" definining business logic and data access services -->
 	<import resource="application-layer-config.xml"/>
 	
-	<bean name="/*" class="org.springframework.webflow.mvc.FlowController">
+	<bean id="handlerMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+		<property name="mappings">
+			<value>
+				/intro=urlFilenameController
+				/main=flowController
+				/resources/*/**=flowController
+				/executions/*/**=flowController
+			</value>
+		</property>
+	</bean>
+		
+	<bean id="flowController" class="org.springframework.webflow.mvc.FlowController">
 		<property name="flowExecutor" ref="flowExecutor" />
 	</bean>
 	
@@ -42,5 +53,14 @@
 			<ref bean="transactionManager"/>
 		</constructor-arg>
 	</bean>
-		
+
+	<!-- Handles requests to render view templates directly: maps the requested path to a logical view name resolved by the resolver below -->
+	<bean id="urlFilenameController" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
+
+	<!-- Maps logical view names selected by the url filename controller to .jsp view templates within the root webapp directory -->	
+	<bean id="internalJspViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/"/>
+		<property name="suffix" value=".jsp" />
+	</bean>
+			
 </beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/index.html b/spring-webflow-samples/booking-mvc/src/main/webapp/index.html
index 4b8dc35b..fce35507 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/index.html
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <html>
 <head>
-  <meta http-equiv="Refresh" content="0; URL=spring/main">
+  <meta http-equiv="Refresh" content="0; URL=spring/intro">
 </head>
 </html>
\ No newline at end of file
