From c8706c33ac9bfff7be1450a34baabc86f41eb291 Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Fri, 28 Jan 2005 06:34:01 +0000
Subject: [PATCH] Log4J no longer expected in servlet container classpath.

---
 doc/xdocs/changes.xml                                   | 1 +
 samples/contacts/src/main/webapp/ca/WEB-INF/web.xml     | 2 ++
 samples/contacts/src/main/webapp/cas/WEB-INF/web.xml    | 2 ++
 samples/contacts/src/main/webapp/filter/WEB-INF/web.xml | 4 +++-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/xdocs/changes.xml b/doc/xdocs/changes.xml
index cce2569ed3..6d96d1ed50 100644
--- a/doc/xdocs/changes.xml
+++ b/doc/xdocs/changes.xml
@@ -28,6 +28,7 @@
     <release version="0.7.1" date="CVS">
       <action dev="benalex" type="update">Made ConfigAttributeDefinition and ConfigAttribute Serializable</action>
       <action dev="benalex" type="update">FilterToBeanProxy now searches hierarchical bean factories</action>
+      <action dev="benalex" type="fix">Contacts sample web.xml no longer expect Log4j to be in classpath</action>
     </release>
     <release version="0.7.0" date="2005-01-16">
       <action dev="carlossg" type="add">Major CVS repository restructure to support Maven and eliminate libraries</action>
diff --git a/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml b/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml
index 605a84b898..a98b06802c 100644
--- a/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml
@@ -56,9 +56,11 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
+	<!--
     <listener>
 		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
 	</listener>
+	 -->
 	
   <!--
 	- Provides core MVC application controller. See contacts-servlet.xml.
diff --git a/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml b/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml
index 83e304921b..aa576e4be0 100644
--- a/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml
@@ -127,9 +127,11 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
+	<!--
     <listener>
 		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
 	</listener>
+	 -->
 	
   <!--
 	- Provides core MVC application controller. See contacts-servlet.xml.
diff --git a/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml b/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml
index abb578b5b6..275708dbc4 100644
--- a/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml
@@ -123,10 +123,12 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
+	<!--
     <listener>
 		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
 	</listener>
-	
+	 -->
+	 
   <!--
 	- Provides core MVC application controller. See contacts-servlet.xml.
     -->