Convert CRLF=>LF on files missed earlier

Complete pass with `dos2unix` found additional files missed on earlier
related commit.

Issue: SPR-5608

org.springframework.context/src/test/java/org/springframework/context/support/spr7283.xml

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
-
-	<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"/>
-
-    <util:list id="list">
-		<bean class="org.springframework.context.support.Spr7283Tests$A"/>
-		<bean class="org.springframework.context.support.Spr7283Tests$B"/>
-	</util:list>
-    
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+
+	<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"/>
+
+    <util:list id="list">
+		<bean class="org.springframework.context.support.Spr7283Tests$A"/>
+		<bean class="org.springframework.context.support.Spr7283Tests$B"/>
+	</util:list>
+    
+</beans>

org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml

@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:lang="http://www.springframework.org/schema/lang"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <aop:config >
-       <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
-    </aop:config>
-
-    <bean id="logUserAdvice" class="org.springframework.scripting.groovy.LogUserAdvice" />
-
-    <!-- N.B. the pointcut never matches if refresh-delay is set (because proxy-target-class is always false) -->
-    <lang:groovy id="groovyBean" script-source="classpath:/org/springframework/scripting/groovy/GroovyServiceImpl.grv" refresh-check-delay="1000"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:lang="http://www.springframework.org/schema/lang"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <aop:config >
+       <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
+    </aop:config>
+
+    <bean id="logUserAdvice" class="org.springframework.scripting.groovy.LogUserAdvice" />
+
+    <!-- N.B. the pointcut never matches if refresh-delay is set (because proxy-target-class is always false) -->
+    <lang:groovy id="groovyBean" script-source="classpath:/org/springframework/scripting/groovy/GroovyServiceImpl.grv" refresh-check-delay="1000"/>
+
 </beans>

org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:lang="http://www.springframework.org/schema/lang"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <aop:config >
-       <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
-    </aop:config>
-
-    <bean id="logUserAdvice" class="org.springframework.scripting.groovy.LogUserAdvice" />
-
-    <lang:groovy id="groovyBean" script-source="classpath:/org/springframework/scripting/groovy/GroovyServiceImpl.grv"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:lang="http://www.springframework.org/schema/lang"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <aop:config >
+       <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
+    </aop:config>
+
+    <bean id="logUserAdvice" class="org.springframework.scripting.groovy.LogUserAdvice" />
+
+    <lang:groovy id="groovyBean" script-source="classpath:/org/springframework/scripting/groovy/GroovyServiceImpl.grv"/>
+
 </beans>

org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:lang="http://www.springframework.org/schema/lang"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <aop:config >
-       <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
-    </aop:config>
-
-    <bean id="logUserAdvice" class="org.springframework.scripting.groovy.LogUserAdvice" />
-
-    <lang:groovy id="groovyBean" script-source="classpath:/org/springframework/scripting/groovy/GroovyServiceImpl.grv" refresh-check-delay="1000" proxy-target-class="true"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:lang="http://www.springframework.org/schema/lang"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <aop:config >
+       <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
+    </aop:config>
+
+    <bean id="logUserAdvice" class="org.springframework.scripting.groovy.LogUserAdvice" />
+
+    <lang:groovy id="groovyBean" script-source="classpath:/org/springframework/scripting/groovy/GroovyServiceImpl.grv" refresh-check-delay="1000" proxy-target-class="true"/>
+
 </beans>

org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:lang="http://www.springframework.org/schema/lang"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <aop:config >
-       <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
-    </aop:config>
-
-    <bean id="logUserAdvice" class="org.springframework.scripting.groovy.LogUserAdvice" />
-
-    <bean id="javaBean" class="org.springframework.scripting.groovy.TestServiceImpl"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:lang="http://www.springframework.org/schema/lang"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <aop:config >
+       <aop:advisor id="logUserAdvisor" pointcut="@within(org.springframework.scripting.groovy.Log)" advice-ref="logUserAdvice"/>
+    </aop:config>
+
+    <bean id="logUserAdvice" class="org.springframework.scripting.groovy.LogUserAdvice" />
+
+    <bean id="javaBean" class="org.springframework.scripting.groovy.TestServiceImpl"/>
+
 </beans>

org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml

@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
-       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-       		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
-
-	<bean id="apc" class="org.springframework.aop.framework.autoproxy.InfrastructureAdvisorAutoProxyCreator"/>
-
-	<bean id="annotationSource" class="org.springframework.cache.annotation.AnnotationCacheOperationSource"/>
-	
-	<aop:config>
-		<aop:advisor advice-ref="debugInterceptor" pointcut="execution(* *..CacheableService.*(..))" order="1"/>
-	</aop:config>
-	
-	<bean id="cacheInterceptor" class="org.springframework.cache.interceptor.CacheInterceptor">
-		<property name="cacheManager" ref="cacheManager"/>
-		<property name="cacheOperationSources" ref="annotationSource"/>
-	</bean>
-	
-	<bean id="advisor" class="org.springframework.cache.interceptor.BeanFactoryCacheOperationSourceAdvisor">
-		<property name="cacheOperationSource" ref="annotationSource"/>
-		<property name="adviceBeanName" value="cacheInterceptor"/>
-	</bean>
-	
-
-	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
-		<property name="caches">
-			<set>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
-			</set>
-		</property>
-	</bean>
-
-	<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
-	
-	<bean id="service" class="org.springframework.cache.config.DefaultCacheableService"/>
-	
-	<bean id="classService" class="org.springframework.cache.config.AnnotatedClassCacheableService"/>
-	
-	<bean id="keyGenerator" class="org.springframework.cache.config.SomeKeyGenerator"/>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
+       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+       		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+
+	<bean id="apc" class="org.springframework.aop.framework.autoproxy.InfrastructureAdvisorAutoProxyCreator"/>
+
+	<bean id="annotationSource" class="org.springframework.cache.annotation.AnnotationCacheOperationSource"/>
+	
+	<aop:config>
+		<aop:advisor advice-ref="debugInterceptor" pointcut="execution(* *..CacheableService.*(..))" order="1"/>
+	</aop:config>
+	
+	<bean id="cacheInterceptor" class="org.springframework.cache.interceptor.CacheInterceptor">
+		<property name="cacheManager" ref="cacheManager"/>
+		<property name="cacheOperationSources" ref="annotationSource"/>
+	</bean>
+	
+	<bean id="advisor" class="org.springframework.cache.interceptor.BeanFactoryCacheOperationSourceAdvisor">
+		<property name="cacheOperationSource" ref="annotationSource"/>
+		<property name="adviceBeanName" value="cacheInterceptor"/>
+	</bean>
+	
+
+	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
+		<property name="caches">
+			<set>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
+			</set>
+		</property>
+	</bean>
+
+	<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
+	
+	<bean id="service" class="org.springframework.cache.config.DefaultCacheableService"/>
+	
+	<bean id="classService" class="org.springframework.cache.config.AnnotatedClassCacheableService"/>
+	
+	<bean id="keyGenerator" class="org.springframework.cache.config.SomeKeyGenerator"/>
+
+</beans>

org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml

@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:cache="http://www.springframework.org/schema/cache"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
-       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-       		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
-
-	<cache:annotation-driven proxy-target-class="false" order="0" key-generator="keyGenerator"/>
-		
-	<aop:config>
-		<aop:advisor advice-ref="debugInterceptor" pointcut="execution(* *..CacheableService.*(..))" order="1"/>
-	</aop:config>
-	
-	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
-		<property name="caches">
-			<set>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
-			</set>
-		</property>
-	</bean>
-
-	<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
-	
-	<bean id="service" class="org.springframework.cache.config.DefaultCacheableService"/>
-	
-	<bean id="classService" class="org.springframework.cache.config.AnnotatedClassCacheableService"/>
-
-	<bean id="keyGenerator" class="org.springframework.cache.config.SomeKeyGenerator"/>
-	
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:cache="http://www.springframework.org/schema/cache"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
+       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+       		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
+
+	<cache:annotation-driven proxy-target-class="false" order="0" key-generator="keyGenerator"/>
+		
+	<aop:config>
+		<aop:advisor advice-ref="debugInterceptor" pointcut="execution(* *..CacheableService.*(..))" order="1"/>
+	</aop:config>
+	
+	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
+		<property name="caches">
+			<set>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
+			</set>
+		</property>
+	</bean>
+
+	<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
+	
+	<bean id="service" class="org.springframework.cache.config.DefaultCacheableService"/>
+	
+	<bean id="classService" class="org.springframework.cache.config.AnnotatedClassCacheableService"/>
+
+	<bean id="keyGenerator" class="org.springframework.cache.config.SomeKeyGenerator"/>
+	
+</beans>

org.springframework.context/src/test/resources/org/springframework/cache/config/cache-advice.xml

@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:cache="http://www.springframework.org/schema/cache"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
-       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-       		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
-
-	<cache:advice id="cacheAdviceInterface" cache-manager="cacheManager">
-		<cache:caching cache="default">
-			<cache:cacheable method="cache"/>
-			<cache:cacheable method="conditional" condition="#classField == 3"/>
-			<cache:cacheable method="key" key="#p0"/>
-			<cache:cacheable method="nam*" key="#root.methodName"/>
-			<cache:cacheable method="rootVars" key="#root.methodName + #root.method.name + #root.targetClass + #root.target"/>
-			<cache:cacheable method="nullValue" cache="default"/>
-		</cache:caching>
-		<cache:caching>
-			<cache:cache-evict method="invalidate" cache="default"/>
-			<cache:cache-evict method="evict" key="#p0" cache="default"/>
-			<cache:cache-evict method="evictWithException" cache="default"/>
-			<cache:cache-evict method="evictEarly" cache="default" before-invocation="true"/>
-			<cache:cache-evict method="invalidateEarly" key="#p0" cache="default" before-invocation="true"/>
-			<cache:cache-evict method="evictAll" cache="default" all-entries="true"/>
-		</cache:caching>
-		<cache:caching cache="default">
-			<cache:cache-put method="update"/>
-			<cache:cache-put method="conditionalUpdate" condition="#arg.equals(3)"/>
-		</cache:caching>
-		<cache:caching method="mult*Cache">
-			<cache:cacheable cache="primary"/>
-			<cache:cacheable cache="secondary"/>
-		</cache:caching>
-		<cache:caching method="multiEvict">
-			<cache:cache-evict cache="primary"/>
-			<cache:cache-evict cache="primary" key="#p0 + 'A'"/>
-			<cache:cache-evict method="multiEvict" cache="secondary" key="#p0"/>
-		</cache:caching>
-		<cache:caching>
-			<cache:cacheable method="multiCacheAndEvict" cache="primary" key="#root.methodName"/>
-			<cache:cache-evict method="multiCacheAndEvict" cache="secondary"/>
-			<cache:cacheable method="multiConditionalCacheAndEvict" cache="primary" condition="#p0 == 3"/>
-			<cache:cache-evict method="multiConditionalCacheAndEvict" cache="secondary"/>
-			<cache:cache-put method="multiUpdate" cache="primary"/>
-			<cache:cache-put method="multiUpdate" cache="secondary"/>
-		</cache:caching>
-	</cache:advice>
-
-	<cache:advice id="cacheAdviceClass" cache-manager="cacheManager" key-generator="keyGenerator">
-		<cache:caching cache="default">
-			<cache:cacheable method="key" key="#p0"/>
-			<cache:cacheable method="nam*" key="#root.methodName + #root.caches[0].name"/>
-			<cache:cacheable method="rootVars" key="#root.methodName + #root.method.name + #root.targetClass + #root.target"/>
-			<cache:cacheable method="cache"/>
-			<cache:cacheable method="conditional"/>
-			<cache:cacheable method="null*"/>
-		</cache:caching>
-		<cache:caching>
-			<cache:cache-evict method="invalidate" cache="default"/>
-			<cache:cache-evict method="evict" key="#p0" cache="default"/>
-			<cache:cache-evict method="evictWithException" cache="default"/>
-			<cache:cache-evict method="evictEarly" cache="default" before-invocation="true"/>
-			<cache:cache-evict method="invalidateEarly" key="#p0" cache="default" before-invocation="true"/>
-			<cache:cache-evict method="evictAll" cache="default" all-entries="true"/>
-		</cache:caching>
-		<cache:caching cache="default">
-			<cache:cache-put method="update"/>
-			<cache:cache-put method="conditionalUpdate" condition="#arg.equals(3)"/>
-		</cache:caching>
-		<cache:caching>
-			<cache:cacheable method="multiCache" cache="primary"/>
-			<cache:cacheable method="multiCache" cache="secondary"/>
-			<cache:cache-evict method="multiEvict" cache="primary"/>
-			<cache:cache-evict method="multiEvict" cache="secondary" key="#p0"/>
-			<cache:cache-evict method="multiEvict" cache="primary" key="#p0 + 'A'"/>
-			<cache:cacheable method="multiCacheAndEvict" cache="primary" key="#root.methodName"/>
-			<cache:cache-evict method="multiCacheAndEvict" cache="secondary"/>
-			<cache:cacheable method="multiConditionalCacheAndEvict" cache="primary" condition="#p0 == 3"/>
-			<cache:cache-evict method="multiConditionalCacheAndEvict" cache="secondary"/>
-			<cache:cache-put method="multiUpdate" cache="primary"/>
-			<cache:cache-put method="multiUpdate" cache="secondary"/>
-		</cache:caching>		
-	</cache:advice>
-		
-	<aop:config>
-		<aop:advisor advice-ref="cacheAdviceInterface" pointcut="execution(* *..DefaultCacheableService.*(..))" order="1"/>
-		<aop:advisor advice-ref="cacheAdviceClass" pointcut="execution(* *..AnnotatedClassCacheableService.*(..))" order="1"/>
-		<aop:advisor advice-ref="debugInterceptor" pointcut="execution(* *..CacheableService.*(..))" order="2"/>
-	</aop:config>
-
-	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
-		<property name="caches">
-			<set>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
-				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
-			</set>
-		</property>
-	</bean>
-	
-	<bean id="keyGenerator" class="org.springframework.cache.config.SomeKeyGenerator"/>
-
-	<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
-	
-	<bean id="service" class="org.springframework.cache.config.DefaultCacheableService"/>
-	
-	<bean id="classService" class="org.springframework.cache.config.AnnotatedClassCacheableService"/>
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:cache="http://www.springframework.org/schema/cache"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
+       		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+       		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
+
+	<cache:advice id="cacheAdviceInterface" cache-manager="cacheManager">
+		<cache:caching cache="default">
+			<cache:cacheable method="cache"/>
+			<cache:cacheable method="conditional" condition="#classField == 3"/>
+			<cache:cacheable method="key" key="#p0"/>
+			<cache:cacheable method="nam*" key="#root.methodName"/>
+			<cache:cacheable method="rootVars" key="#root.methodName + #root.method.name + #root.targetClass + #root.target"/>
+			<cache:cacheable method="nullValue" cache="default"/>
+		</cache:caching>
+		<cache:caching>
+			<cache:cache-evict method="invalidate" cache="default"/>
+			<cache:cache-evict method="evict" key="#p0" cache="default"/>
+			<cache:cache-evict method="evictWithException" cache="default"/>
+			<cache:cache-evict method="evictEarly" cache="default" before-invocation="true"/>
+			<cache:cache-evict method="invalidateEarly" key="#p0" cache="default" before-invocation="true"/>
+			<cache:cache-evict method="evictAll" cache="default" all-entries="true"/>
+		</cache:caching>
+		<cache:caching cache="default">
+			<cache:cache-put method="update"/>
+			<cache:cache-put method="conditionalUpdate" condition="#arg.equals(3)"/>
+		</cache:caching>
+		<cache:caching method="mult*Cache">
+			<cache:cacheable cache="primary"/>
+			<cache:cacheable cache="secondary"/>
+		</cache:caching>
+		<cache:caching method="multiEvict">
+			<cache:cache-evict cache="primary"/>
+			<cache:cache-evict cache="primary" key="#p0 + 'A'"/>
+			<cache:cache-evict method="multiEvict" cache="secondary" key="#p0"/>
+		</cache:caching>
+		<cache:caching>
+			<cache:cacheable method="multiCacheAndEvict" cache="primary" key="#root.methodName"/>
+			<cache:cache-evict method="multiCacheAndEvict" cache="secondary"/>
+			<cache:cacheable method="multiConditionalCacheAndEvict" cache="primary" condition="#p0 == 3"/>
+			<cache:cache-evict method="multiConditionalCacheAndEvict" cache="secondary"/>
+			<cache:cache-put method="multiUpdate" cache="primary"/>
+			<cache:cache-put method="multiUpdate" cache="secondary"/>
+		</cache:caching>
+	</cache:advice>
+
+	<cache:advice id="cacheAdviceClass" cache-manager="cacheManager" key-generator="keyGenerator">
+		<cache:caching cache="default">
+			<cache:cacheable method="key" key="#p0"/>
+			<cache:cacheable method="nam*" key="#root.methodName + #root.caches[0].name"/>
+			<cache:cacheable method="rootVars" key="#root.methodName + #root.method.name + #root.targetClass + #root.target"/>
+			<cache:cacheable method="cache"/>
+			<cache:cacheable method="conditional"/>
+			<cache:cacheable method="null*"/>
+		</cache:caching>
+		<cache:caching>
+			<cache:cache-evict method="invalidate" cache="default"/>
+			<cache:cache-evict method="evict" key="#p0" cache="default"/>
+			<cache:cache-evict method="evictWithException" cache="default"/>
+			<cache:cache-evict method="evictEarly" cache="default" before-invocation="true"/>
+			<cache:cache-evict method="invalidateEarly" key="#p0" cache="default" before-invocation="true"/>
+			<cache:cache-evict method="evictAll" cache="default" all-entries="true"/>
+		</cache:caching>
+		<cache:caching cache="default">
+			<cache:cache-put method="update"/>
+			<cache:cache-put method="conditionalUpdate" condition="#arg.equals(3)"/>
+		</cache:caching>
+		<cache:caching>
+			<cache:cacheable method="multiCache" cache="primary"/>
+			<cache:cacheable method="multiCache" cache="secondary"/>
+			<cache:cache-evict method="multiEvict" cache="primary"/>
+			<cache:cache-evict method="multiEvict" cache="secondary" key="#p0"/>
+			<cache:cache-evict method="multiEvict" cache="primary" key="#p0 + 'A'"/>
+			<cache:cacheable method="multiCacheAndEvict" cache="primary" key="#root.methodName"/>
+			<cache:cache-evict method="multiCacheAndEvict" cache="secondary"/>
+			<cache:cacheable method="multiConditionalCacheAndEvict" cache="primary" condition="#p0 == 3"/>
+			<cache:cache-evict method="multiConditionalCacheAndEvict" cache="secondary"/>
+			<cache:cache-put method="multiUpdate" cache="primary"/>
+			<cache:cache-put method="multiUpdate" cache="secondary"/>
+		</cache:caching>		
+	</cache:advice>
+		
+	<aop:config>
+		<aop:advisor advice-ref="cacheAdviceInterface" pointcut="execution(* *..DefaultCacheableService.*(..))" order="1"/>
+		<aop:advisor advice-ref="cacheAdviceClass" pointcut="execution(* *..AnnotatedClassCacheableService.*(..))" order="1"/>
+		<aop:advisor advice-ref="debugInterceptor" pointcut="execution(* *..CacheableService.*(..))" order="2"/>
+	</aop:config>
+
+	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
+		<property name="caches">
+			<set>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
+				<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
+			</set>
+		</property>
+	</bean>
+	
+	<bean id="keyGenerator" class="org.springframework.cache.config.SomeKeyGenerator"/>
+
+	<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
+	
+	<bean id="service" class="org.springframework.cache.config.DefaultCacheableService"/>
+	
+	<bean id="classService" class="org.springframework.cache.config.AnnotatedClassCacheableService"/>
+</beans>