config org

spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/dispatcher-portlet-config.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<!-- No special configuration needed here - all configuration is driven by web-application-config.xml -->
-	
-</beans>

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/dispatcher-portlet-config.xml
+				/WEB-INF/config/web-application-config.xml
 			</value>
 		</init-param>
 

spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml

@@ -4,26 +4,6 @@
 	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/web-application-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>