Added webAppRootKey context-param to samples to prevent conflicts when run together in Tomcat.

samples/cas/client/src/main/webapp/WEB-INF/web.xml

@@ -27,6 +27,11 @@
         <param-value>/WEB-INF/classes/log4j.properties</param-value>
     </context-param>
 
+    <context-param>
+        <param-name>webAppRootKey</param-name>
+        <param-value>cas.root</param-value>
+    </context-param>
+
     <filter>
        <filter-name>CAS Single Sign Out Filter</filter-name>
        <filter-class>org.jasig.cas.client.session.SingleSignOutFilter</filter-class>

samples/contacts/src/main/webapp/WEB-INF/web.xml

@@ -32,6 +32,10 @@
         <param-value>/WEB-INF/classes/log4j.properties</param-value>
     </context-param>
 
+    <context-param>
+        <param-name>webAppRootKey</param-name>
+        <param-value>contacts.root</param-value>
+    </context-param>
 
     <filter>
         <filter-name>springSecurityFilterChain</filter-name>

samples/ldap/src/main/webapp/WEB-INF/web.xml

@@ -22,6 +22,11 @@
         </param-value>
     </context-param>
 
+    <context-param>
+        <param-name>webAppRootKey</param-name>
+        <param-value>ldap.root</param-value>
+    </context-param>
+
     <filter>
         <filter-name>springSecurityFilterChain</filter-name>
         <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>

sandbox/heavyduty/src/main/webapp/WEB-INF/classes/log4j.properties

@@ -1,19 +1,10 @@
 # Global logging configuration
 log4j.rootLogger=DEBUG, stdout
 
-log4j.logger.org.springframework.security=DEBUG, stdout
-log4j.logger.org.apache.directory=INFO, stdout
+log4j.logger.org.springframework.security=DEBUG
+log4j.logger.org.apache.directory=INFO
 
 # Console output...
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%L] - %m%n
-
-# Rolling log file output...
-#log4j.appender.fileout=org.apache.log4j.RollingFileAppender
-#log4j.appender.fileout.File=spring-security-tutorial.log
-#log4j.appender.fileout.File=${webapp.root}/WEB-INF/log4j.log
-#log4j.appender.fileout.MaxFileSize=1024KB
-#log4j.appender.fileout.MaxBackupIndex=1
-#log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
-#log4j.appender.fileout.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n

sandbox/heavyduty/src/main/webapp/WEB-INF/web.xml

@@ -29,6 +29,11 @@
         <param-value>/WEB-INF/classes/log4j.properties</param-value>
     </context-param>
 
+    <context-param>
+        <param-name>webAppRootKey</param-name>
+        <param-value>heavyduty.root</param-value>
+    </context-param>
+
     <filter>
         <filter-name>springSecurityFilterChain</filter-name>
         <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>