SWF-1366 Add RequestHandler for JSF resource requests and update sample config

spring-faces/src/main/java/org/springframework/faces/webflow/FacesJsfResourceRequestHandler.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2004-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.faces.webflow;
+
+import java.io.IOException;
+
+import javax.faces.FactoryFinder;
+import javax.faces.application.ResourceHandler;
+import javax.faces.context.FacesContext;
+import javax.faces.context.FacesContextFactory;
+import javax.faces.lifecycle.Lifecycle;
+import javax.faces.lifecycle.LifecycleFactory;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.HttpRequestHandler;
+import org.springframework.web.context.support.WebApplicationObjectSupport;
+
+/**
+ * Handles a request by delegating to the JSF ResourceHandler, which serves web application and classpath resources such
+ * as images, CSS and JavaScript files from well-known locations.
+ * 
+ * @since 2.2.0
+ * @author Rossen Stoyanchev
+ * @see ResourceHandler
+ */
+public class FacesJsfResourceRequestHandler extends WebApplicationObjectSupport implements HttpRequestHandler {
+
+	public void handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+			IOException {
+		FacesContext context = getFacesContext(request, response);
+		ResourceHandler resourceHandler = context.getApplication().getResourceHandler();
+		resourceHandler.handleResourceRequest(context);
+	}
+
+	private FacesContext getFacesContext(HttpServletRequest request, HttpServletResponse response) {
+		FacesContextFactory facesContextFactory = (FacesContextFactory) FactoryFinder
+				.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
+		LifecycleFactory lifecycleFactory = (LifecycleFactory) FactoryFinder
+				.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
+		Lifecycle lifecycle = lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
+		return facesContextFactory.getFacesContext(getServletContext(), request, response, lifecycle);
+	}
+
+}

spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml

@@ -1,12 +1,21 @@
 <?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">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<!-- Maps JSF 2 resource requests to an instance of org.springframework.faces.webflow.FacesJsfResourceRequestHandler  -->
+	<bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+		<property name="order" value="0"/>
+		<property name="mappings">
+			<value>
+				/javax.faces.resource/**=jsfResourceHandler
+			</value>
+		</property>
+	</bean>
 
 	<!-- Maps request paths to flows in the flowRegistry; e.g. a path of /hotels/booking looks for a flow with id "hotels/booking" -->
 	<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping">
+		<property name="order" value="1"/>
 		<property name="flowRegistry" ref="flowRegistry" />
 		<property name="defaultHandler">
 			<!-- If no flow match, map path to a view to render; e.g. the "/intro" path would map to the view named "intro" -->	
@@ -28,5 +37,11 @@
 	<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter">
 		<property name="flowExecutor" ref="flowExecutor" />
 	</bean>
+
+	<!-- Dispatches requests mapped to org.springframework.web.HttpRequestHandler implementations -->	
+	<bean class="org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter" />
+
+	<!-- Delegates to the JSF ResourceHandler to serve web application resources such as images, .css and .js files. -->	
+	<bean id="jsfResourceHandler" class="org.springframework.faces.webflow.FacesJsfResourceRequestHandler"/>
 				
 </beans>