From cb1b1c1c665eb7f97d41d873d03d533be84bc555 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 24 Apr 2008 14:59:50 +0000
Subject: [PATCH] polish

---
 ...ig.xml => hotelbooking-portlet-config.xml} |  1 -
 .../src/main/webapp/WEB-INF/portlet.xml       |  2 +-
 .../src/main/webapp/WEB-INF/web.xml           | 20 +++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 rename spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/{web-application-config.xml => hotelbooking-portlet-config.xml} (95%)

diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml
similarity index 95%
rename from spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
rename to spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml
index df8021ce..54cb750b 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml
@@ -17,6 +17,5 @@
 	<!-- Imports the configurations of the different infrastructure systems of the application -->
 	<import resource="webmvc-config.xml" />
 	<import resource="webflow-config.xml" />
-	<import resource="data-access-config.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml
index 6c265695..56e9734f 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml
@@ -15,7 +15,7 @@
 		<init-param>
 			<name>contextConfigLocation</name>
 			<value>
-				/WEB-INF/config/web-application-config.xml
+				/WEB-INF/config/hotelbooking-portlet-config.xml
 			</value>
 		</init-param>
 
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
index 9c192aba..40d44004 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
@@ -4,6 +4,26 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
 	version="2.4">
 
+    <!--
+	  - Location of the XML file that defines the root application context
+	  - Applied by ContextLoaderListener.
+	  -->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>
+			/WEB-INF/config/data-access-config.xml
+		</param-value>
+	</context-param>
+
+	<!--
+	  - Loads the root application context of this web app at startup.
+	  - The application context is then available via
+	  - WebApplicationContextUtils.getWebApplicationContext(servletContext).
+    -->
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	
   	<!-- Serves static resource content from .jar files such as spring-js.jar -->
 	<servlet>
 		<servlet-name>Resources Servlet</servlet-name>