From a864a58594d9d9455d0db4d5c6daf317aee96a2b Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Tue, 26 Feb 2008 16:31:54 +0000
Subject: [PATCH] obsolete

---
 spring-binding/ivy.xml                        |  6 ++---
 spring-faces/ivy.xml                          |  2 +-
 spring-webflow-samples/booking-jsf/ivy.xml    | 10 ++++----
 .../src/main/webapp/WEB-INF/web.xml           |  8 +++----
 spring-webflow/ivy.xml                        | 24 +++++++++----------
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml
index a7dd44a9..2ec28124 100644
--- a/spring-binding/ivy.xml
+++ b/spring-binding/ivy.xml
@@ -18,9 +18,9 @@
 			<exclude module="servlet-api"/>
 		</dependency>
 		<dependency org="ognl" name="ognl" rev="2.6.9" />
-		<dependency org="org.springframework" name="spring-beans" rev="2.5" />
-		<dependency org="org.springframework" name="spring-context"	rev="2.5" />
-		<dependency org="org.springframework" name="spring-core" rev="2.5" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.5.1" />
+		<dependency org="org.springframework" name="spring-context"	rev="2.5.1" />
+		<dependency org="org.springframework" name="spring-core" rev="2.5.1" />
 
 		<!-- build time only dependencies -->
 		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default"/>
diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml
index b5e57cfb..c4d4c747 100644
--- a/spring-faces/ivy.xml
+++ b/spring-faces/ivy.xml
@@ -54,7 +54,7 @@
 		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
 		<dependency org="jboss" name="jboss-el" rev="1.0" conf="test->default"/>
 		<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
-		<dependency org="org.springframework" name="spring-test" rev="2.5-rc2" conf="test->default" />
+		<dependency org="org.springframework" name="spring-test" rev="2.5.1" conf="test->default" />
 		
 	</dependencies>
 
diff --git a/spring-webflow-samples/booking-jsf/ivy.xml b/spring-webflow-samples/booking-jsf/ivy.xml
index c654f051..ef10c5b8 100755
--- a/spring-webflow-samples/booking-jsf/ivy.xml
+++ b/spring-webflow-samples/booking-jsf/ivy.xml
@@ -18,10 +18,10 @@
 	<dependency org="aopalliance" name="aopalliance" rev="1.0" />
     <dependency org="org.springframework" name="spring-faces" rev="latest.integration" conf="global->jsf12"/>
     <dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->default"/>
-    <dependency org="org.springframework" name="spring-aop" rev="2.5"/>
-    <dependency org="org.springframework" name="spring-orm" rev="2.5"/>
-    <dependency org="org.springframework" name="spring-jdbc" rev="2.5"/>
-    <dependency org="org.springframework" name="spring-tx" rev="2.5"/>
+    <dependency org="org.springframework" name="spring-aop" rev="2.5.1"/>
+    <dependency org="org.springframework" name="spring-orm" rev="2.5.1"/>
+    <dependency org="org.springframework" name="spring-jdbc" rev="2.5.1"/>
+    <dependency org="org.springframework" name="spring-tx" rev="2.5.1"/>
     <dependency org="jboss" name="jboss-el" rev="1.0"/>
 	<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" />
 	<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga"/>
@@ -37,7 +37,7 @@
 	
 	<!-- test-time only dependencies -->
     <dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
-    <dependency org="org.springframework" name="spring-test" rev="2.5" conf="test->default"/>
+    <dependency org="org.springframework" name="spring-test" rev="2.5.1" conf="test->default"/>
   </dependencies>
   
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml
index fa7615f6..b24a711c 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml
@@ -44,10 +44,10 @@
 
 	<!-- The front controller of the Spring Web application, responsible for handling all application requests -->
 	<servlet>
-		<servlet-name>Spring Web Servlet</servlet-name>
-		<servlet-class>org.springframework.webflow.servlet.SpringWebServlet</servlet-class>
+		<servlet-name>Spring Web MVC Dispatcher Servlet</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispacherServlet</servlet-class>
 		<init-param>
-			<param-name>configLocations</param-name>
+			<param-name>contextConfigLocation</param-name>
 			<param-value>/WEB-INF/config/web-application-config.xml</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
@@ -55,7 +55,7 @@
 		
 	<!-- Map all *.spring requests to the Web Servlet for handling -->
 	<servlet-mapping>
-		<servlet-name>Spring Web Servlet</servlet-name>
+		<servlet-name>Spring Web MVC Dispatcher Servlet</servlet-name>
 		<url-pattern>/spring/*</url-pattern>
 	</servlet-mapping>
 
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 01797455..6064d458 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -31,31 +31,31 @@
 		<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
 		<dependency org="xml-apis" name="xml-apis" rev="1.3.03"/>
 		-->
-		<dependency org="org.springframework" name="spring-beans" rev="2.5" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.5.1" />
 		<dependency org="org.springframework" name="spring-binding" rev="latest.integration" />
-		<dependency org="org.springframework" name="spring-core" rev="2.5" />
-		<dependency org="org.springframework" name="spring-context" rev="2.5" />
-		<dependency org="org.springframework" name="spring-web" rev="2.5" />
+		<dependency org="org.springframework" name="spring-core" rev="2.5.1" />
+		<dependency org="org.springframework" name="spring-context" rev="2.5.1" />
+		<dependency org="org.springframework" name="spring-web" rev="2.5.1" />
 		
 		<!-- testing support only dependencies -->
 		<dependency org="junit" name="junit" rev="3.8.2" conf="buildtime, testing->default" />
 
 		<!-- spring mvc only dependencies -->
-		<dependency org="org.springframework" name="spring-webmvc" rev="2.5" conf="buildtime, mvc->default" />
+		<dependency org="org.springframework" name="spring-webmvc" rev="2.5.1" conf="buildtime, mvc->default" />
 
 		<!-- spring portlet mvc only dependencies -->
-		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5" conf="buildtime, portlet->default" />
+		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.1" conf="buildtime, portlet->default" />
 
 		<!-- struts only dependencies -->
 		<dependency org="struts" name="struts" rev="1.2.9" conf="buildtime, struts->default" />
-		<dependency org="org.springframework" name="spring-webmvc-struts" rev="2.5" conf="buildtime, struts->default" />
+		<dependency org="org.springframework" name="spring-webmvc-struts" rev="2.5.1" conf="buildtime, struts->default" />
 
 		<!-- build time only dependencies -->		
 		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
 		<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="buildtime->default" />
 		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default" />
-		<dependency org="org.springframework" name="spring-orm" rev="2.5" conf="buildtime->default" />
-		<dependency org="org.springframework" name="spring-tx" rev="2.5" conf="buildtime->default" />
+		<dependency org="org.springframework" name="spring-orm" rev="2.5.1" conf="buildtime->default" />
+		<dependency org="org.springframework" name="spring-tx" rev="2.5.1" conf="buildtime->default" />
 		<dependency org="javax.persistence" name="persistence-api" rev="1.0b" conf="buildtime->default" />
 		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime->default" />
 	
@@ -66,9 +66,9 @@
 		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
 		<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
 		<dependency org="aopalliance" name="aopalliance" rev="1.0" conf="test->default"/>
-		<dependency org="org.springframework" name="spring-aop" rev="2.5" conf="test->default" />		
-		<dependency org="org.springframework" name="spring-jdbc" rev="2.5" conf="test->default" />
-		<dependency org="org.springframework" name="spring-test" rev="2.5" conf="test->default" />
+		<dependency org="org.springframework" name="spring-aop" rev="2.5.1" conf="test->default" />		
+		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.1" conf="test->default" />
+		<dependency org="org.springframework" name="spring-test" rev="2.5.1" conf="test->default" />
 		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="buildtime, test->default" />
 		<dependency org="org.apache.openjpa" name="openjpa" rev="1.0.1" conf="test->default">
 			<!-- Exclusions required because open jpa pom is poorly designed -->