From 7fa9a959b53f38dcdc4f6b6fe805ecaa83ac1065 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 16 Dec 2008 21:13:03 +0000
Subject: [PATCH] Added webAppRootKey context-param to samples to prevent
 conflicts when run together in Tomcat.

---
 .../client/src/main/webapp/WEB-INF/web.xml    |  65 +++++-----
 .../contacts/src/main/webapp/WEB-INF/web.xml  | 116 +++++++++---------
 samples/ldap/src/main/webapp/WEB-INF/web.xml  |   5 +
 .../webapp/WEB-INF/classes/log4j.properties   |  13 +-
 .../heavyduty/src/main/webapp/WEB-INF/web.xml |  77 ++++++------
 5 files changed, 143 insertions(+), 133 deletions(-)

diff --git a/samples/cas/client/src/main/webapp/WEB-INF/web.xml b/samples/cas/client/src/main/webapp/WEB-INF/web.xml
index f5b60bf375..d208d5e6d5 100644
--- a/samples/cas/client/src/main/webapp/WEB-INF/web.xml
+++ b/samples/cas/client/src/main/webapp/WEB-INF/web.xml
@@ -12,61 +12,66 @@
     <display-name>Spring Security CAS Demo Application</display-name>
 
     <!--
-	  - Location of the XML file that defines the root application context
-	  - Applied by ContextLoaderListener.
-	  -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			/WEB-INF/applicationContext-security.xml
-		</param-value>
-	</context-param>
+      - Location of the XML file that defines the root application context
+      - Applied by ContextLoaderListener.
+      -->
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>
+            /WEB-INF/applicationContext-security.xml
+        </param-value>
+    </context-param>
 
     <context-param>
         <param-name>log4jConfigLocation</param-name>
         <param-value>/WEB-INF/classes/log4j.properties</param-value>
     </context-param>
 
-	<filter>
-	   <filter-name>CAS Single Sign Out Filter</filter-name>
-	   <filter-class>org.jasig.cas.client.session.SingleSignOutFilter</filter-class>
-	</filter>
+    <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>
+    </filter>
 
     <filter>
         <filter-name>springSecurityFilterChain</filter-name>
         <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
     </filter>
 
-	<filter-mapping>
-	   <filter-name>CAS Single Sign Out Filter</filter-name>
-	   <url-pattern>/*</url-pattern>
-	</filter-mapping>
+    <filter-mapping>
+       <filter-name>CAS Single Sign Out Filter</filter-name>
+       <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
     <filter-mapping>
       <filter-name>springSecurityFilterChain</filter-name>
       <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-	<!--
-	  - Loads the root application context of this web app at startup.
-	  - The application context is then available via
-	  - WebApplicationContextUtils.getWebApplicationContext(servletContext).
+    <!--
+      - Loads the root application context of this web app at startup.
+      - The application context is then available via
+      - WebApplicationContextUtils.getWebApplicationContext(servletContext).
     -->
-	<listener>
-		<listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
-	</listener>
+    <listener>
+        <listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
+    </listener>
 
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 
     <listener>
         <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-    </listener>    
+    </listener>
 
     <!--
-	  - Publishes events for session creation and destruction through the application
-	  - context. Optional unless concurrent session control is being used.
+      - Publishes events for session creation and destruction through the application
+      - context. Optional unless concurrent session control is being used.
       -->
     <listener>
       <listener-class>org.springframework.security.ui.session.HttpSessionEventPublisher</listener-class>
diff --git a/samples/contacts/src/main/webapp/WEB-INF/web.xml b/samples/contacts/src/main/webapp/WEB-INF/web.xml
index ce91b2378c..669a9fbc32 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/WEB-INF/web.xml
@@ -12,26 +12,30 @@
 
     <display-name>Contacts Sample Application</display-name>
 
-	<!--
-	  - Location of the XML file that defines the root application context
-	  - Applied by ContextLoaderListener.
-	  -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			/WEB-INF/applicationContext-security.xml
-			classpath:applicationContext-common-business.xml
-			classpath:applicationContext-common-authorization.xml
-		</param-value>
-	</context-param>
+    <!--
+      - Location of the XML file that defines the root application context
+      - Applied by ContextLoaderListener.
+      -->
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>
+            /WEB-INF/applicationContext-security.xml
+            classpath:applicationContext-common-business.xml
+            classpath:applicationContext-common-authorization.xml
+        </param-value>
+    </context-param>
 
    <!-- 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>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>
+    </context-param>
 
     <filter>
         <filter-name>springSecurityFilterChain</filter-name>
@@ -43,18 +47,18 @@
       <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-	<!--
-	  - Loads the root application context of this web app at startup.
-	  - The application context is then available via
-	  - WebApplicationContextUtils.getWebApplicationContext(servletContext).
+    <!--
+      - Loads the root application context of this web app at startup.
+      - The application context is then available via
+      - WebApplicationContextUtils.getWebApplicationContext(servletContext).
     -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 
-	<listener>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>
+    <listener>
+        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+    </listener>
 
     <!--
         The HttpSessionEventPublisher will publish
@@ -66,40 +70,40 @@
     </listener>
 
   <!--
-	- Provides core MVC application controller. See contacts-servlet.xml.
+    - Provides core MVC application controller. See contacts-servlet.xml.
     -->
-	<servlet>
-		<servlet-name>contacts</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
+    <servlet>
+        <servlet-name>contacts</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
 
   <!--
     - Provides web services endpoint. See remoting-servlet.xml.
     -->
-	<servlet>
-		<servlet-name>remoting</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-    	<servlet-name>contacts</servlet-name>
-    	<url-pattern>*.htm</url-pattern>
- 	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>remoting</servlet-name>
-		<url-pattern>/remoting/*</url-pattern>
-	</servlet-mapping>
-
- 	<welcome-file-list>
-		<welcome-file>index.jsp</welcome-file>
-	</welcome-file-list>
-
-	<error-page>
-		<error-code>403</error-code>
-		<location>/error.html</location>
-	</error-page>
+    <servlet>
+        <servlet-name>remoting</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>contacts</servlet-name>
+        <url-pattern>*.htm</url-pattern>
+     </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>remoting</servlet-name>
+        <url-pattern>/remoting/*</url-pattern>
+    </servlet-mapping>
+
+     <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+
+    <error-page>
+        <error-code>403</error-code>
+        <location>/error.html</location>
+    </error-page>
 
 </web-app>
diff --git a/samples/ldap/src/main/webapp/WEB-INF/web.xml b/samples/ldap/src/main/webapp/WEB-INF/web.xml
index 38d3b7d50f..05dae3ab99 100644
--- a/samples/ldap/src/main/webapp/WEB-INF/web.xml
+++ b/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>
diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/log4j.properties b/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/log4j.properties
index 0ce72aa265..4859cd5307 100755
--- a/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/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
diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/web.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/web.xml
index f43928bc2d..1d6f237482 100755
--- a/sandbox/heavyduty/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/web.xml
@@ -10,24 +10,29 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
 
     <display-name>Spring Security Tutorial Application</display-name>
-    
+
     <!--
-	  - Location of the XML file that defines the root application context
-	  - Applied by ContextLoaderListener.
-	  -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath:applicationContext-business.xml
-			/WEB-INF/appContext-persistence.xml
-			/WEB-INF/appContext-security.xml
-		</param-value>
-	</context-param>
-	
+      - Location of the XML file that defines the root application context
+      - Applied by ContextLoaderListener.
+      -->
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>
+            classpath:applicationContext-business.xml
+            /WEB-INF/appContext-persistence.xml
+            /WEB-INF/appContext-security.xml
+        </param-value>
+    </context-param>
+
     <context-param>
         <param-name>log4jConfigLocation</param-name>
         <param-value>/WEB-INF/classes/log4j.properties</param-value>
-    </context-param>	
+    </context-param>
+
+    <context-param>
+        <param-name>webAppRootKey</param-name>
+        <param-value>heavyduty.root</param-value>
+    </context-param>
 
     <filter>
         <filter-name>springSecurityFilterChain</filter-name>
@@ -43,39 +48,39 @@
         <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
     </listener>
 
-	<!--
-	  - Loads the root application context of this web app at startup.
-	  - The application context is then available via
-	  - WebApplicationContextUtils.getWebApplicationContext(servletContext).
+    <!--
+      - Loads the root application context of this web app at startup.
+      - The application context is then available via
+      - WebApplicationContextUtils.getWebApplicationContext(servletContext).
     -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 
-	<!--
-	  - Publishes events for session creation and destruction through the application
-	  - context. Optional unless concurrent session control is being used.
+    <!--
+      - Publishes events for session creation and destruction through the application
+      - context. Optional unless concurrent session control is being used.
       -->
     <listener>
         <listener-class>org.springframework.security.ui.session.HttpSessionEventPublisher</listener-class>
     </listener>
 
   <!--
-	- Provides core MVC application controller.
+    - Provides core MVC application controller.
     -->
-	<servlet>
-		<servlet-name>heavyduty</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
+    <servlet>
+        <servlet-name>heavyduty</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
 
-	<servlet-mapping>
-    	<servlet-name>heavyduty</servlet-name>
-    	<url-pattern>*.htm</url-pattern>
- 	</servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>heavyduty</servlet-name>
+        <url-pattern>*.htm</url-pattern>
+     </servlet-mapping>
 
      <welcome-file-list>
-		<welcome-file>index.jsp</welcome-file>
-	</welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
 
 </web-app>