diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/dispatcher-portlet-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/dispatcher-portlet-config.xml deleted file mode 100644 index 3da3506e..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/dispatcher-portlet-config.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ 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 81c9d5a8..6c265695 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 @@ contextConfigLocation - /WEB-INF/config/dispatcher-portlet-config.xml + /WEB-INF/config/web-application-config.xml 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 c94c82ac..9c192aba 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,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"> - - - contextConfigLocation - - /WEB-INF/config/web-application-config.xml - - - - - - org.springframework.web.context.ContextLoaderListener - - Resources Servlet