From fb43aa40edd2daadcc19bc519789dff619a6ffb3 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Fri, 9 Feb 2018 10:42:47 -0500
Subject: [PATCH] Polish

---
 booking-faces/pom.xml                                        | 2 +-
 .../samples/booking/config/DispatcherServletInitializer.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml
index 09d6e82..0efe4e0 100644
--- a/booking-faces/pom.xml
+++ b/booking-faces/pom.xml
@@ -61,7 +61,7 @@
 			<artifactId>jsf-impl</artifactId>
 			<version>${mojarra.version}</version>
 		</dependency>
-		<!-- JSF implementation: MyFaces
+		<!-- JSF implementation: MyFaces (also change DispatcherServletInitializer)
 		<dependency>
 			<groupId>org.apache.myfaces.core</groupId>
 			<artifactId>myfaces-api</artifactId>
diff --git a/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java b/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java
index 63fd218..b673cdd 100644
--- a/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java
+++ b/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java
@@ -4,8 +4,6 @@ import javax.servlet.Filter;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 
-import com.sun.faces.config.ConfigureListener;
-
 import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
@@ -44,7 +42,8 @@ public class DispatcherServletInitializer extends AbstractAnnotationConfigDispat
 		// Declare Spring Security Facelets tag library
 		servletContext.setInitParameter("javax.faces.FACELETS_LIBRARIES", "/WEB-INF/springsecurity.taglib.xml");
 
-		servletContext.addListener(ConfigureListener.class);
+		// Comment out if not using Mojarra
+		servletContext.addListener(com.sun.faces.config.ConfigureListener.class);
 
 		// Let the DispatcherServlet be registered
 		super.onStartup(servletContext);