From 6c169d9acf818aa602be395d338bf108a0744537 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 29 Aug 2007 12:12:45 +0000
Subject: [PATCH] SEC-508: Added CDATA sections to multi-line text values in
 tutorial and contacts sample context files to prevent eclipse reforatting bug
  from messing them up.

---
 .../WEB-INF/applicationContext-acegi-security.xml    | 12 ++++++------
 .../WEB-INF/applicationContext-acegi-security.xml    |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/samples/contacts/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml b/samples/contacts/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
index 9de26a1c66..33a9744e0a 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
+++ b/samples/contacts/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
@@ -18,11 +18,11 @@
 	      of "httpSessionContextIntegrationFilter" in the list below -->
 	<bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
       <property name="filterInvocationDefinitionSource">
-         <value>
+         <value><![CDATA[
 		    CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
 		    PATTERN_TYPE_APACHE_ANT
             /**=httpSessionContextIntegrationFilter,logoutFilter,authenticationProcessingFilter,basicProcessingFilter,securityContextHolderAwareRequestFilter,rememberMeProcessingFilter,anonymousProcessingFilter,switchUserProcessingFilter,exceptionTranslationFilter,filterInvocationInterceptor
-         </value>
+         ]]></value>
       </property>
     </bean>
 
@@ -123,13 +123,13 @@
    <bean id="channelProcessingFilter" class="org.acegisecurity.securechannel.ChannelProcessingFilter">
       <property name="channelDecisionManager"><ref local="channelDecisionManager"/></property>
       <property name="filterInvocationDefinitionSource">
-         <value>
+         <value><![CDATA[
 			    CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
 				\A/secure/.*\Z=REQUIRES_SECURE_CHANNEL
 				\A/acegilogin.jsp.*\Z=REQUIRES_SECURE_CHANNEL
 				\A/j_acegi_security_check.*\Z=REQUIRES_SECURE_CHANNEL
 				\A.*\Z=REQUIRES_INSECURE_CHANNEL
-         </value>
+         ]]></value>
       </property>
    </bean>
 
@@ -185,7 +185,7 @@
       <property name="authenticationManager"><ref bean="authenticationManager"/></property>
       <property name="accessDecisionManager"><ref local="httpRequestAccessDecisionManager"/></property>
       <property name="objectDefinitionSource">
-         <value>
+         <value><![CDATA[
 			    CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
 			    PATTERN_TYPE_APACHE_ANT
 			    /index.jsp=ROLE_ANONYMOUS,ROLE_USER
@@ -195,7 +195,7 @@
 			    /j_acegi_switch_user=ROLE_SUPERVISOR
 			    /acegilogin.jsp*=ROLE_ANONYMOUS,ROLE_USER
 				/**=ROLE_USER
-         </value>
+         ]]></value>
       </property>
    </bean>
 
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
index 591daac4a1..f105bb134d 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
@@ -20,11 +20,11 @@
 
 	<bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
 		<property name="filterInvocationDefinitionSource">
-			<value>
+			<value><![CDATA[
 				CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
 				PATTERN_TYPE_APACHE_ANT
 				/**=httpSessionContextIntegrationFilter,logoutFilter,authenticationProcessingFilter,securityContextHolderAwareRequestFilter,rememberMeProcessingFilter,anonymousProcessingFilter,exceptionTranslationFilter,filterInvocationInterceptor
-			</value>
+			]]></value>
 		</property>
 	</bean>
 
@@ -88,13 +88,13 @@
 			</bean>
 		</property>
 		<property name="objectDefinitionSource">
-			<value>
+			<value><![CDATA[
 				CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
 				PATTERN_TYPE_APACHE_ANT
 				/secure/extreme/**=ROLE_SUPERVISOR
 				/secure/**=IS_AUTHENTICATED_REMEMBERED
 				/**=IS_AUTHENTICATED_ANONYMOUSLY
-			</value>
+			]]></value>
 		</property>
 	</bean>