From ae7418f97c68046ed82a1e2320ebece55890f655 Mon Sep 17 00:00:00 2001
From: Erwin Vervaet <erwin.vervaet@ervacon.com>
Date: Wed, 10 Jan 2007 00:57:14 +0000
Subject: [PATCH] Kicked log4j config stuff out of sellitem samples.

---
 .../src/main/webapp/WEB-INF/web.xml            | 16 +---------------
 .../sellitem/src/main/webapp/WEB-INF/web.xml   | 18 ++----------------
 2 files changed, 3 insertions(+), 31 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 4af3701c..46de0a53 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
@@ -4,16 +4,6 @@
     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"
     version="2.4">
-	
-	<context-param>
-		<param-name>webAppRootKey</param-name>
-		<param-value>swf-sellitem-jsf.root</param-value>
-	</context-param>
-	
-	<context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/classes/log4j.properties</param-value>
-	</context-param>
 
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
@@ -27,10 +17,6 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
-	<listener>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>
-	
     <!-- a Listener for MyFaces, that does all the startup work (configuration, init). -->
     <listener>
         <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
@@ -51,5 +37,5 @@
 	<welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
 	</welcome-file-list>
-	
+
 </web-app>
\ No newline at end of file
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/web.xml
index 7cba7ad3..b0d1cff3 100644
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/web.xml
@@ -4,11 +4,6 @@
     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"
     version="2.4">
-	
-	<context-param>
-		<param-name>webAppRootKey</param-name>
-		<param-value>swf-sellitem.root</param-value>
-	</context-param>
 
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
@@ -17,18 +12,9 @@
 		</param-value>
 	</context-param>
 
-	<context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/classes/log4j.properties</param-value>
-	</context-param>
-
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
-	
-	<listener>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>
 
 	<servlet>
 		<servlet-name>sellitem</servlet-name>
@@ -41,7 +27,7 @@
 			</param-value>
 		</init-param>
 	</servlet>
-	
+
 	<servlet-mapping>
 		<servlet-name>sellitem</servlet-name>
 		<url-pattern>*.htm</url-pattern>
@@ -50,5 +36,5 @@
 	<welcome-file-list>
 		<welcome-file>index.jsp</welcome-file>
 	</welcome-file-list>
-	
+
 </web-app>
\ No newline at end of file