From 722a832958eba83234db271bb1e064b7d7c5d8ac Mon Sep 17 00:00:00 2001
From: Scott Andrews <sandrews@vmware.com>
Date: Thu, 10 Apr 2008 22:22:57 +0000
Subject: [PATCH] resources servlet is now in spring-js

---
 spring-webflow-samples/booking-portlet-mvc/ivy.xml            | 3 ++-
 .../src/main/webapp/WEB-INF/classes/log4j.properties          | 2 +-
 .../booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/spring-webflow-samples/booking-portlet-mvc/ivy.xml b/spring-webflow-samples/booking-portlet-mvc/ivy.xml
index ef6fdc15..2208c143 100644
--- a/spring-webflow-samples/booking-portlet-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/ivy.xml
@@ -27,12 +27,13 @@
 		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="compile->default"/>
 		<dependency org="org.apache" name="commons-codec" rev="1.3" conf="compile->default"/>
 		<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="compile->default" />
-		<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="spring-aop" rev="2.5.3" conf="compile->default"/>
 		<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="compile->default"/>
 		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.3" conf="compile->default"/>
 		<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.3" conf="compile->default"/>
 		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
 		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="compile->default"/>
 		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile->default"/>
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/classes/log4j.properties b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/classes/log4j.properties
index 992d816d..0b9061f0 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -6,6 +6,6 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
 
 # Enable web flow logging
 log4j.category.org.springframework.webflow=DEBUG
-log4j.category.org.springframework.faces=DEBUG
+log4j.category.org.springframework.js=DEBUG
 log4j.category.org.springframework.binding=DEBUG
 log4j.category.org.springframework.transaction=DEBUG
\ No newline at end of file
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 71b13f9a..93b0b3ff 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
@@ -24,10 +24,10 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
   	
-  	<!-- Serves static resource content from .jar files such as spring-faces.jar -->
+  	<!-- Serves static resource content from .jar files such as spring-js.jar -->
 	<servlet>
 		<servlet-name>Resources Servlet</servlet-name>
-		<servlet-class>org.springframework.faces.ui.resource.ResourceServlet</servlet-class>
+		<servlet-class>org.springframework.js.resource.ResourceServlet</servlet-class>
 		<load-on-startup>0</load-on-startup>
 	</servlet>