Spring/spring-webflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace FacesServlet declaration w/ ConfigureListener

Browse Source
This commit is contained in:
Rossen Stoyanchev
2014-02-26 22:41:32 -05:00
parent 7d8a3ce8dd
commit 242b5908da
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java
View File

@@ -4,12 +4,14 @@ import javax.faces.webapp.FacesServlet;
import javax.servlet.Filter;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRegistration.Dynamic;
import javax.servlet.ServletRegistration;
import org.springframework.web.filter.CharacterEncodingFilter;
import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
public class DispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
import com.sun.faces.config.ConfigureListener;
public class DispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
@Override
protected Class<?>[] getRootConfigClasses() {
@@ -43,10 +45,7 @@ public class DispatcherServletInitializer extends AbstractAnnotationConfigDispa
// Declare Spring Security Facelets tag library
servletContext.setInitParameter("javax.faces.FACELETS_LIBRARIES", "/WEB-INF/springsecurity.taglib.xml");
// Add this so the JSF implementation can initialize, *not* used for request processing
Dynamic facesServlet = servletContext.addServlet("facesServlet", new FacesServlet());
facesServlet.addMapping("*.faces");
facesServlet.setLoadOnStartup(0);
servletContext.addListener(ConfigureListener.class);
// Let the DispatcherServlet be registered
super.onStartup(servletContext);

2
booking-faces/src/test/java/org/springframework/webflow/samples/booking/MainFlowExecutionTests.java
View File

@@ -78,7 +78,7 @@ public class MainFlowExecutionTests extends AbstractXmlFlowExecutionTests {
hotel.setId(1L);
hotel.setName("Jameson Inn");
hotels.add(hotel);
HotelLazyDataModel dataModel = new HotelLazyDataModel(null, null);
HotelLazyDataModel dataModel = new HotelLazyDataModel();
dataModel.setSelected(hotel);
getViewScope().put("hotels", dataModel);