From a67b5297344967da44fd09113d4d876cf4985f5a Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sat, 16 Jul 2005 23:54:55 +0000
Subject: [PATCH] Add the display-name to the web.xml

---
 samples/acegifier/src/webapp/WEB-INF/classes/acegi-web.xsl | 3 ++-
 samples/acegifier/src/webapp/WEB-INF/web.xml               | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/samples/acegifier/src/webapp/WEB-INF/classes/acegi-web.xsl b/samples/acegifier/src/webapp/WEB-INF/classes/acegi-web.xsl
index 38207de1e6..011c210d83 100644
--- a/samples/acegifier/src/webapp/WEB-INF/classes/acegi-web.xsl
+++ b/samples/acegifier/src/webapp/WEB-INF/classes/acegi-web.xsl
@@ -61,7 +61,8 @@
     
   <xsl:apply-templates select="filter-mapping"/>
 
-  <xsl:if test="not(./listener/listener-class[string()='org.springframework.web.context.ContextLoaderListener')">
+  <!-- Only add a spring context loader listener if there isn't one there already -->
+  <xsl:if test="not(./listener/listener-class[string()='org.springframework.web.context.ContextLoaderListener'])">
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
diff --git a/samples/acegifier/src/webapp/WEB-INF/web.xml b/samples/acegifier/src/webapp/WEB-INF/web.xml
index ee9694fdfe..aa302262e2 100644
--- a/samples/acegifier/src/webapp/WEB-INF/web.xml
+++ b/samples/acegifier/src/webapp/WEB-INF/web.xml
@@ -4,6 +4,7 @@
          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" >
+  <display-name>Acegifier Application</display-name>
 
 	<context-param>
 		<param-name>contextConfigLocation</param-name>