From 2494ce02da2ac7894fd59a038090c0726477825a Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Mon, 9 Apr 2007 21:06:55 +0000
Subject: [PATCH] *.faces over *.jsf

---
 .../sellitem-jsf/src/main/webapp/WEB-INF/web.xml       | 10 ++++++----
 .../sellitem-jsf/src/main/webapp/index.jsp             |  2 +-
 .../sellitem-jsf/src/main/webapp/intro.jsp             |  2 --
 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/web.xml
index 46de0a53..ccf8949a 100644
--- a/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
@@ -13,25 +12,28 @@
 		</param-value>
 	</context-param>
 
+    <!-- Bootstraps the root Spring Web Application Context, responsible for deploying managed beans
+         defined in the configuration files above.  These beans represent the services used by the JSF application. -->
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
-    <!-- a Listener for MyFaces, that does all the startup work (configuration, init). -->
+    <!-- MyFaces listener that starts up the JSF engine by reading faces-config.xml -->
     <listener>
         <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
     </listener>
 
-    <!-- Faces Servlet -->
+    <!-- The front controller for the JSF application, responsible for handling all application requests -->
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
 
+    <!-- Map all requests to *.faces to the Faces Servlet for handling -->
     <servlet-mapping>
         <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
+        <url-pattern>*.faces</url-pattern>
     </servlet-mapping>
 
 	<welcome-file-list>
diff --git a/spring-webflow-samples/sellitem-jsf/src/main/webapp/index.jsp b/spring-webflow-samples/sellitem-jsf/src/main/webapp/index.jsp
index 62f04a2c..c0395360 100644
--- a/spring-webflow-samples/sellitem-jsf/src/main/webapp/index.jsp
+++ b/spring-webflow-samples/sellitem-jsf/src/main/webapp/index.jsp
@@ -3,6 +3,6 @@
   <head>
   </head>
   <body>
-    <jsp:forward page="intro.jsf" />
+    <jsp:forward page="intro.faces" />
   </body>
 </html>
diff --git a/spring-webflow-samples/sellitem-jsf/src/main/webapp/intro.jsp b/spring-webflow-samples/sellitem-jsf/src/main/webapp/intro.jsp
index 71737d4c..9c23e177 100644
--- a/spring-webflow-samples/sellitem-jsf/src/main/webapp/intro.jsp
+++ b/spring-webflow-samples/sellitem-jsf/src/main/webapp/intro.jsp
@@ -1,5 +1,3 @@
- <%-- make sure we have a session --%>
-<%@ page session="true" %>
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
 
