From dc201b7989d377c2812053c12aac01fc5f010b8c Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Sat, 6 Oct 2012 10:15:35 -0500
Subject: [PATCH] Remove log4jConfigLocation from sample web.xml files

This prevents errors looking for the LogManager which is no longer
on the classpath since we use sl4j.
---
 samples/cas/sample/src/main/webapp/WEB-INF/web.xml | 5 -----
 samples/contacts/src/main/webapp/WEB-INF/web.xml   | 5 -----
 samples/openid/src/main/webapp/WEB-INF/web.xml     | 5 -----
 samples/tutorial/src/main/webapp/WEB-INF/web.xml   | 5 -----
 4 files changed, 20 deletions(-)

diff --git a/samples/cas/sample/src/main/webapp/WEB-INF/web.xml b/samples/cas/sample/src/main/webapp/WEB-INF/web.xml
index 460607cd4d..1fbb0496c6 100644
--- a/samples/cas/sample/src/main/webapp/WEB-INF/web.xml
+++ b/samples/cas/sample/src/main/webapp/WEB-INF/web.xml
@@ -21,11 +21,6 @@
         </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>webAppRootKey</param-name>
         <param-value>cas.root</param-value>
diff --git a/samples/contacts/src/main/webapp/WEB-INF/web.xml b/samples/contacts/src/main/webapp/WEB-INF/web.xml
index f1783027fa..1abe7a9235 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/WEB-INF/web.xml
@@ -26,11 +26,6 @@
 
    <!-- Nothing below here needs to be modified -->
 
-    <context-param>
-        <param-name>log4jConfigLocation</param-name>
-        <param-value>/WEB-INF/classes/log4j.properties</param-value>
-    </context-param>
-
     <context-param>
         <param-name>webAppRootKey</param-name>
         <param-value>contacts.root</param-value>
diff --git a/samples/openid/src/main/webapp/WEB-INF/web.xml b/samples/openid/src/main/webapp/WEB-INF/web.xml
index 600ab6d539..314a4e8fce 100644
--- a/samples/openid/src/main/webapp/WEB-INF/web.xml
+++ b/samples/openid/src/main/webapp/WEB-INF/web.xml
@@ -21,11 +21,6 @@
         </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>webAppRootKey</param-name>
         <param-value>openid.root</param-value>
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/web.xml b/samples/tutorial/src/main/webapp/WEB-INF/web.xml
index ce19450d59..6289dde58e 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/web.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/web.xml
@@ -22,11 +22,6 @@
         </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>webAppRootKey</param-name>
         <param-value>tutorial.root</param-value>