diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
index 0dae03ee94..b853f8bd26 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
@@ -25,14 +25,14 @@
 	<bean id="buffer" class="java.lang.StringBuffer">
 		<constructor-arg ref="int" />
 	</bean>
-	
+
 	<bean id="thread" class="java.lang.Thread"/>
-	
+
 	<bean id="field" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
 	   <property name="targetObject" ref="thread"/>
    	   <property name="targetField" value="MAX_PRIORITY"/>
 	 </bean>
-	
+
 	<bean id="secondBuffer" class="java.lang.StringBuffer">
 		<constructor-arg ref="field"/>
 	</bean>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
index 71586ad8d3..11d9f33a67 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
@@ -8,6 +8,5 @@
 		<property name="age"><value>25</value></property>
 	</bean>
 
-</beans>		
-	
-	
\ No newline at end of file
+</beans>	
+
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml
index 1058161049..3fc565ba81 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml
@@ -12,5 +12,5 @@
     <property name="name"><value>bean2</value></property>
     <property name="objRef"><ref bean="beans1.bean2"/></property>
   </bean>
- 
+
 </beans>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml
index a5167f6bfe..22d1efdd2b 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml
@@ -12,5 +12,5 @@
     <property name="name"><value>beans2.bean2</value></property>
     <property name="objRef"><ref bean="beans1.bean1"/></property>
   </bean>
- 
+
 </beans>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans1.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans1.xml
index 1058161049..3fc565ba81 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans1.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans1.xml
@@ -12,5 +12,5 @@
     <property name="name"><value>bean2</value></property>
     <property name="objRef"><ref bean="beans1.bean2"/></property>
   </bean>
- 
+
 </beans>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans2.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans2.xml
index a5167f6bfe..22d1efdd2b 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans2.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans2.xml
@@ -12,5 +12,5 @@
     <property name="name"><value>beans2.bean2</value></property>
     <property name="objRef"><ref bean="beans1.bean1"/></property>
   </bean>
- 
+
 </beans>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
index 3e5e8fa5ae..09e68d8f38 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
@@ -26,7 +26,7 @@
         <constructor-arg value="#2"/>
     </bean>
 
-    <bean id="testBean" 
+    <bean id="testBean"
           class="org.springframework.beans.factory.annotation.CustomAutowireConfigurerTests$TestBean"
           autowire="constructor"/>
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml
index 3f0b9e5fc6..aafb5327e0 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
-	
+
 	<bean id="prototypeTarget" class="java.util.Date" scope="prototype"/>
 
 	<bean id="prototypeFactory" class="org.springframework.beans.factory.config.ObjectFactoryCreatingFactoryBean">
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
index 490aab8790..5dfa450fe2 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
@@ -11,7 +11,7 @@
 			</bean>
 		</property>
   </bean>
-	
+
 	<bean id="otb" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="age"><value>98</value></property>
 		<property name="spouse">
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml
index 9a4917c5e9..36a8aeaebf 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml
@@ -6,35 +6,35 @@
 	default-lazy-init="true">
 
 	<bean name="spring-init" class="org.springframework.beans.factory.support.security.support.InitBean"/>
-	
+
 	<bean name="spring-destroy" class="org.springframework.beans.factory.support.security.support.DestroyBean"/>
-	
+
 	<bean name="custom-init" class="org.springframework.beans.factory.support.security.support.CustomCallbackBean"
 			init-method="init"/>
-	
-	<bean name="custom-destroy" class="org.springframework.beans.factory.support.security.support.CustomCallbackBean" 
+
+	<bean name="custom-destroy" class="org.springframework.beans.factory.support.security.support.CustomCallbackBean"
 			destroy-method="destroy"/>
 
 	<bean name="spring-factory" class="org.springframework.beans.factory.support.security.support.CustomFactoryBean"/>
-	
+
 	<bean name="custom-static-factory-method" class="org.springframework.beans.factory.support.security.support.FactoryBean" factory-method="makeStaticInstance"/>
-	
+
 	<bean name="factory-bean" class="org.springframework.beans.factory.support.security.support.FactoryBean"/>
-	
+
 	<bean name="custom-factory-method" factory-bean="factory-bean" factory-method="makeInstance"/>
-	
+
 	<bean name="constructor" class="org.springframework.beans.factory.support.security.support.ConstructorBean"/>
-	
+
 	<bean name="working-factory-method" class="org.springframework.beans.factory.support.security.support.FactoryBean" factory-method="protectedStaticInstance"/>
-	
+
 	<bean name="container-execution" class="org.springframework.beans.factory.support.security.support.ConstructorBean">
 		<constructor-arg ref="working-factory-method"/>
 	</bean>
-	
+
 	<bean name="property-injection" class="org.springframework.beans.factory.support.security.support.PropertyBean">
 		<property name="securityProperty" value="value"/>
 	</bean>
-	
+
 	<bean name="working-property-injection" class="org.springframework.beans.factory.support.security.support.PropertyBean">
 		<property name="property">
 			<array>
@@ -44,7 +44,7 @@
 	</bean>
 
 	<bean name="privileged-static-factory-method" class="java.lang.System" factory-method="getProperties"/>
-	
+
 	<!-- check trusted beans -->
 	<bean name="trusted-spring-callbacks" class="org.springframework.beans.factory.support.security.CallbacksSecurityTests$NonPrivilegedSpringCallbacksBean">
 		<constructor-arg value="user1"/>
@@ -54,27 +54,27 @@
 			init-method="init" destroy-method="destroy">
 		<constructor-arg value="user1"/>
 	</bean>
-	
+
 	<bean name="trusted-spring-factory" class="org.springframework.beans.factory.support.security.CallbacksSecurityTests$NonPrivilegedFactoryBean">
 		<constructor-arg value="user1"/>
 	</bean>
-	
-	<bean name="trusted-static-factory-method" class="org.springframework.beans.factory.support.security.CallbacksSecurityTests$NonPrivilegedFactory" 
+
+	<bean name="trusted-static-factory-method" class="org.springframework.beans.factory.support.security.CallbacksSecurityTests$NonPrivilegedFactory"
 		factory-method="makeStaticInstance">
-		<constructor-arg value="user1"/>			
+		<constructor-arg value="user1"/>		
 	</bean>
-	
+
 	<bean name="trusted-factory-bean" class="org.springframework.beans.factory.support.security.CallbacksSecurityTests$NonPrivilegedFactory">
 		<constructor-arg value="user1"/>
 	</bean>
-	
+
 	<bean name="trusted-factory-method" factory-bean="trusted-factory-bean" factory-method="makeInstance"/>
-	
+
 	<bean name="trusted-property-injection" class="org.springframework.beans.factory.support.security.CallbacksSecurityTests$NonPrivilegedBean">
 		<constructor-arg value="user1"/>
 		<property name="property" value="value"/>
 	</bean>
-	
+
 	<bean name="trusted-working-property-injection" class="org.springframework.beans.factory.support.security.CallbacksSecurityTests$NonPrivilegedBean">
 		<constructor-arg value="user1"/>
 		<property name="property">
@@ -89,5 +89,5 @@
 			</list>
 		</property>
 	</bean>
-	
+
 </beans>
\ No newline at end of file
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
index ffcd3f7da9..9a39ab975b 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
@@ -11,13 +11,13 @@
 
 	<bean id="defaultTestBean" factory-bean="default" factory-method="getTestBean"
 			init-method="haveBirthday" destroy-method="destroy"/>
-			
+		
 	<bean id="defaultTestBeanWithInvalidDestroyMethod" factory-bean="default" factory-method="getTestBean"
 			init-method="haveBirthday" destroy-method="xxx" lazy-init="true"/>
 
 	<bean id="defaultTestBean.protected" factory-bean="default" factory-method="protectedGetTestBean"
 			init-method="haveBirthday" destroy-method="destroy"/>
-			
+		
 	<bean id="defaultTestBean.private" factory-bean="default" factory-method="privateGetTestBean"
 			init-method="haveBirthday" destroy-method="destroy"/>
 
@@ -40,7 +40,7 @@
 		<constructor-arg index="1"><value>27</value></constructor-arg>
 		<constructor-arg index="2"><value>gotcha</value></constructor-arg>
 	</bean>
-	
+
 	<bean id="fullWithNull" class="org.springframework.beans.factory.xml.FactoryMethods"
 			factory-method="newInstance" lazy-init="true">
 		<constructor-arg index="2" type="java.lang.Integer"><null/></constructor-arg>
@@ -95,7 +95,7 @@
 		<constructor-arg><value>gotcha</value></constructor-arg>
 		<constructor-arg><ref local="juergen"/></constructor-arg>
 	</bean>
-	
+
 	<bean id="noMatchPrototype" class="org.springframework.beans.factory.xml.FactoryMethods"
 			factory-method="newInstance" scope="prototype">
 		<constructor-arg index="0"><ref local="juergen"/></constructor-arg>
@@ -114,17 +114,17 @@
 	<!--
 		The class is the factory class, not the created class.
 	-->
-	<bean id="externalFactoryMethodWithoutArgs" 
+	<bean id="externalFactoryMethodWithoutArgs"
 			class="org.springframework.beans.factory.xml.TestBeanCreator"
 			factory-method="createTestBean">
 	</bean>
-	
+
 	<bean id="externalFactoryMethodWithArgs" class="org.springframework.beans.factory.xml.TestBeanCreator"
 			factory-method="createTestBean">
 		<constructor-arg index="0"><value>Rod</value></constructor-arg>
 		<constructor-arg><value type="java.lang.Integer">33</value></constructor-arg>
 	</bean>
-	
+
 	<bean id="instanceFactoryMethodWithoutArgs" factory-bean="instanceFactory" factory-method="defaultInstance"/>
 
 	<!-- Unnamed bean with factory-bean declaration -->
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
index d961644301..b267428887 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
@@ -4,14 +4,14 @@
 		xmlns:c="http://www.springframework.org/schema/c"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
- <!-- 
+ <!--
 	<bean id="simple1" class="org.springframework.tests.sample.beans.DummyBean">
 		<constructor-arg value="name"/>
 	</bean>
- -->	
+ -->
 	<bean id="simple" class="org.springframework.tests.sample.beans.DummyBean" c:_="simple"/>
 
-<!-- 
+<!--
 	<bean id="simple1-ref" class="org.springframework.tests.sample.beans.DummyBean">
 		<constructor-arg ref="name"/>
 	</bean>
@@ -21,27 +21,27 @@
 	<bean id="name" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="some-name" index="0"/>
 	</bean>
-	
-<!-- 
+
+<!--
 	<bean id="name-value1" class="org.springframework.tests.sample.beans.TestBean">
 		<constructor-arg name="name" value="foo"/>
 		<constructor-arg name="age" value="10"/>
 	</bean>
- -->	
+ -->
 	<bean id="name-value" class="org.springframework.tests.sample.beans.TestBean" c:age="10" c:name="name-value"/>
 
-<!-- 	
+<!-- 
 	<bean id="name-ref1" class="org.springframework.tests.sample.beans.DummyBean">
 		<constructor-arg name="name" ref="name"/>
 		<constructor-arg name="spouse" ref="name-value"/>
 	</bean>
  -->
 	<bean id="name-ref" class="org.springframework.tests.sample.beans.DummyBean" c:name-ref="name" c:spouse-ref="name-value"/>
-	
+
 	<bean id="indexed-value" class="org.springframework.tests.sample.beans.DummyBean" c:_1="austria" c:_0="at" c:_2="10"/>
-	
+
 	<bean id="indexed-ref" class="org.springframework.tests.sample.beans.DummyBean" c:_0-ref="name" c:_1-ref="name-value"/>
- 
+
 	<bean id="beanWithRefConstructorArg" class="org.springframework.tests.sample.beans.DummyBean" c:nameRef="silly name" c:ageRef="10"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
index 11e054c3b4..6956ac3c71 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
@@ -174,13 +174,13 @@
 		<prop key="foo2">bar2</prop>
 	</util:properties>
 
-	<util:properties id="defaultLocalOverrideProperties" 
+	<util:properties id="defaultLocalOverrideProperties"
 			location="classpath:/org/springframework/beans/factory/xml/util.properties">
 		<prop key="foo">local</prop>
 		<prop key="foo2">local2</prop>
 	</util:properties>
 
-	<util:properties id="trueLocalOverrideProperties" 
+	<util:properties id="trueLocalOverrideProperties"
 			location="classpath:/org/springframework/beans/factory/xml/util.properties"
 			local-override="true">
 		<prop key="foo">local</prop>
diff --git a/spring-context-support/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml b/spring-context-support/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml
index dcac796151..77e003350f 100644
--- a/spring-context-support/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml
+++ b/spring-context-support/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml
@@ -38,7 +38,7 @@
         timeToLiveSeconds="120"
         overflowToDisk="true"
         />
-        
+       
     <cache name="myCache1"
         maxElementsInMemory="300"
         eternal="false"
@@ -46,5 +46,5 @@
         timeToLiveSeconds="500"
         overflowToDisk="true"
         />
-        
+       
 </ehcache>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
index 77dd0c3624..f15aa06df7 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
@@ -5,12 +5,12 @@
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	
+
 	<aop:config>
 		<aop:aspect id="afterThrowingAdviceBindingTests" ref="testAspect">
 			<aop:after-throwing
 			    method="noArgs"
-			    pointcut="execution(* exceptional(..))"	
+			    pointcut="execution(* exceptional(..))"
 			/>
 			<aop:after-throwing
 				method="oneThrowable"
@@ -21,7 +21,7 @@
 				method="oneRuntimeException"
 				throwing="ex"
 				pointcut="execution(* exceptional(..))"
-			/>			
+			/>		
 			<aop:after-throwing
 				method="noArgsOnThrowableMatch"
 				throwing="java.lang.Throwable"
@@ -31,12 +31,12 @@
 				method="noArgsOnRuntimeExceptionMatch"
 				throwing="java.lang.RuntimeException"
 				pointcut="execution(* exceptional(..))"
-			/>			
-	</aop:aspect>		
+			/>		
+	</aop:aspect>	
 	</aop:config>
-	
+
 	<bean id="testAspect" class="org.springframework.aop.aspectj.AfterThrowingAdviceBindingTestAspect"/>
-	
+
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
-	
+
 </beans>
\ No newline at end of file
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
index 038614eccf..2f92db8631 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
@@ -4,7 +4,7 @@
 			 xmlns:aop="http://www.springframework.org/schema/aop"
 			 xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-	
+
 	<aop:config>
 
 		<aop:advisor id="lowPrecedenceAdvisor"
@@ -15,7 +15,7 @@
 		<aop:advisor id="highPrecedenceAdvisor"
 			advice-ref="highPrecedenceSpringAdvice"
 			pointcut="execution(* getAge(..))"
-			order="90"/>		
+			order="90"/>	
 
 		<aop:aspect ref="lowPrecedenceAspect" order="1000">
 
@@ -49,36 +49,36 @@
 
 			<aop:before
 				method="beforeAdviceOne"
-				pointcut="execution(* getAge())"/>				
-			
+				pointcut="execution(* getAge())"/>			
+		
 			<aop:before
 				method="beforeAdviceTwo"
-				pointcut="execution(* getAge())"/>				
-			
+				pointcut="execution(* getAge())"/>			
+		
 			<aop:around
 				method="aroundAdviceOne"
-				pointcut="execution(* getAge())"/>				
-			
+				pointcut="execution(* getAge())"/>			
+		
 			<aop:around
 				method="aroundAdviceTwo"
-				pointcut="execution(* getAge())"/>				
-			
+				pointcut="execution(* getAge())"/>			
+		
 			<aop:after-returning
 				method="afterAdviceOne"
-				pointcut="execution(* getAge())"/>				
-			
+				pointcut="execution(* getAge())"/>			
+		
 			<aop:after-returning
 				method="afterAdviceTwo"
-				pointcut="execution(* getAge())"/>				
-									
+				pointcut="execution(* getAge())"/>			
+								
 		</aop:aspect>
 
 	</aop:config>
-	
+
 	<bean id="highPrecedenceSpringAdvice" class="org.springframework.aop.aspectj.SimpleSpringBeforeAdvice"/>
 
 	<bean id="lowPrecedenceSpringAdvice" class="org.springframework.aop.aspectj.SimpleSpringBeforeAdvice"/>
-	
+
 	<bean id="highPrecedenceAspect" class="org.springframework.aop.aspectj.PrecedenceTestAspect">
 		<property name="order" value="10"/>
 	</bean>
@@ -86,5 +86,5 @@
 	<bean id="lowPrecedenceAspect" class="org.springframework.aop.aspectj.PrecedenceTestAspect"/>
 
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
index 42dafc3e90..bc9f22188c 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
@@ -48,15 +48,15 @@
 	</bean>
 
 	<bean id="counterAspect" class="org.springframework.aop.aspectj.Counter"/>
- 
+
 	<aop:config>
      <aop:advisor pointcut="bean(*This) and !bean(dont*)" advice-ref="testInterceptor"/>
-	</aop:config> 
+	</aop:config>
 
 	<bean id="interceptThis" class="org.springframework.tests.sample.beans.TestBean"/>
 
 	<bean id="dontInterceptThis" class="org.springframework.tests.sample.beans.TestBean"/>
-	
+
 	<bean id="testInterceptor" class="org.springframework.aop.aspectj.BeanNamePointcutTests$TestInterceptor"/>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
index f1d0bdc21c..7ecb079c46 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
@@ -6,12 +6,12 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
   <bean id="topsyTurvyAspect" class="org.springframework.aop.aspectj.TopsyTurvyAspect"/>
-  
+ 
   <bean id="topsyTurvyTarget" class="org.springframework.aop.aspectj.TopsyTurvyTargetImpl"/>
 
   <aop:config>
     <aop:aspect id="myAspect" ref="topsyTurvyAspect">
-      <aop:before pointcut-ref="pc1" 
+      <aop:before pointcut-ref="pc1"
                   method="before"/>
       <aop:declare-parents
         types-matching="*..TopsyTurvyTarget+"
@@ -25,8 +25,8 @@
       <aop:declare-parents
         types-matching="*..TopsyTurvyTarget+"
         implement-interface="org.springframework.beans.factory.BeanNameAware"
-        default-impl="org.springframework.aop.aspectj.DeclarationOrderIndependenceTests$BeanNameAwareMixin"/>          
+        default-impl="org.springframework.aop.aspectj.DeclarationOrderIndependenceTests$BeanNameAwareMixin"/>         
     </aop:aspect>
   </aop:config>
-  
+ 
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
index ee552093f9..ad56c861a2 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
@@ -12,11 +12,11 @@
 				implement-interface="org.springframework.aop.aspectj.ICounter"
 				delegate-ref="counter"
 			/>
-		</aop:aspect>		
+		</aop:aspect>	
 	</aop:config>
 
 	<bean id="noMethodsBean" class="org.springframework.aop.aspectj.NoMethodsBeanImpl"/>
-	
+
 	<bean id="counter" class="org.springframework.aop.aspectj.Counter"/>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
index c88962cd53..eabf2568c1 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
@@ -12,7 +12,7 @@
 	<aop:aspectj-autoproxy proxy-target-class="true">
 		<aop:include name="counterAtAspectJAspect"/>
 	</aop:aspectj-autoproxy>
-		
+	
 	<bean id="counterAtAspectJAspect"
 		class="org.springframework.aop.aspectj.ImplicitJPArgumentMatchingAtAspectJTests$CounterAtAspectJAspect"/>
 </beans>
\ No newline at end of file
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
index 6a4a56e7f0..e4cf459ab6 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
@@ -7,12 +7,12 @@
 
 	<aop:config proxy-target-class="true">
 		<aop:aspect ref="counterAspect">
-			<aop:pointcut id="anyOperation" 
+			<aop:pointcut id="anyOperation"
 				expression="execution(* org.springframework.tests.sample.beans.TestBean.*(..)) and this(bean) and args(argument)"/>
 			<aop:around pointcut-ref="anyOperation" method="increment" arg-names="bean,argument"/>
 		</aop:aspect>
 	</aop:config>
-	
+
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name" value="aTestBean"/>
 	</bean>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
index f8ca001d0d..5a245d3a9c 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
@@ -5,16 +5,16 @@
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	
+
 	<aop:config>
 		<aop:aspect id="ambiguousAdviceTest" ref="testAspect">
 			<aop:pointcut id="setter" expression="execution(* setName(..)) and args(name)"/>
 			<aop:before pointcut-ref="setter" method="myBeforeAdvice"/>
-		</aop:aspect>		
+		</aop:aspect>	
 	</aop:config>
-	
+
 	<bean id="testAspect" class="org.springframework.aop.aspectj.OverloadedAdviceTestAspect"/>
-	
+
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
-	
+
 </beans>
\ No newline at end of file
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
index 94725cb5e3..3db07d1e43 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
@@ -5,17 +5,17 @@
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	
+
 	<aop:config>
 		<aop:aspect id="overloadedAdviceTest" ref="testAspect">
 			<aop:pointcut id="setter" expression="execution(* setName(..)) and args(name)"/>
 			<aop:before pointcut-ref="setter" method="myBeforeAdvice(java.lang.String)"/>
 			<aop:before pointcut-ref="setter" method="myBeforeAdvice(int)"/>
-		</aop:aspect>		
+		</aop:aspect>	
 	</aop:config>
-	
+
 	<bean id="testAspect" class="org.springframework.aop.aspectj.OverloadedAdviceTestAspect"/>
-	
+
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
-	
+
 </beans>
\ No newline at end of file
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
index 1100db6b5a..e062899f36 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
@@ -5,7 +5,7 @@
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	
+
 	<aop:config>
 		<aop:aspect id="beforeAdviceBindingTests" ref="testAspect">
 		  <aop:pointcut id="foo" expression="execution(* foo(..)) and args(x)"/>
@@ -13,7 +13,7 @@
 		  <aop:before pointcut-ref="foo" method="doBefore(java.lang.String)"/>
 		</aop:aspect>
 	</aop:config>
-	
+
 	<bean id="toBeAdvised" class="org.springframework.aop.aspectj.ToBeAdvised"/>
 
 	<bean id="testAspect" class="org.springframework.aop.aspectj.MyAspect"/>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
index 6fb76c1b52..e51fbb65a1 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
@@ -5,7 +5,7 @@
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	
+
 	<aop:config>
 		<aop:aspect id="thisMatcher" ref="testAspect">
 		  <aop:before pointcut="execution(* *(..)) and this(java.io.Serializable)" method="toString"/>
@@ -18,10 +18,10 @@
 		</aop:aspect>
 	</aop:config>
 
-	<!--  should not be proxied -->	
+	<!--  should not be proxied -->
 	<bean id="testClassA" class="org.springframework.aop.aspectj.SubtypeMatchingTestClassA"/>
 
-	<!--  should be proxied -->	
+	<!--  should be proxied -->
 	<bean id="testClassB" class="org.springframework.aop.aspectj.SubtypeMatchingTestClassB"/>
 
 	<!--  should be proxied -->
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
index 98bf02616e..f8fb56b145 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
@@ -12,6 +12,6 @@
 
 	<bean id="testBean" class="org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests$TestImpl" />
 	<bean id="testAnnotatedClassBean" class="org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests$AnnotatedClassTestImpl" />
-	<bean id="testAnnotatedMethodBean" class="org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests$AnnotatedMethodTestImpl" />	
-	
+	<bean id="testAnnotatedMethodBean" class="org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests$AnnotatedMethodTestImpl" />
+
 </beans>
\ No newline at end of file
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
index 4d2cb3c4bb..1624fdfb17 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
@@ -52,5 +52,5 @@
 	<bean id="thisAsInterfaceAndTargetAsInterfaceCounter" class="org.springframework.aop.aspectj.Counter" />
 	<bean id="thisAsInterfaceAndTargetAsClassCounter" class="org.springframework.aop.aspectj.Counter" />
 	<bean id="testBean" class="org.springframework.aop.aspectj.TestImpl" />
-	
+
 </beans>
\ No newline at end of file
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml
index 9d3daabadd..f19b17b355 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml
@@ -16,7 +16,7 @@
 	</bean>
 
 	<bean id="testAspect" class="org.springframework.aop.aspectj.autoproxy.AnnotationBindingTestAspect"/>
-	
+
 	<bean id="testBean" class="org.springframework.aop.aspectj.autoproxy.AnnotatedTestBeanImpl"/>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
index 6490decb21..2991eef380 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
@@ -12,7 +12,7 @@
 			<aop:around pointcut-ref="anyOperation" method="increment"/>
 		</aop:aspect>
 	</aop:config>
-	
+
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean" />
 
 	<bean id="interfaceExtendingAspect"
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
index da15419d11..406422efc2 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
@@ -8,9 +8,9 @@
 	<!--
 	<bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator" />
 	-->
-	
+
 	<aop:aspectj-autoproxy/>
-	
+
 	<bean class="org.springframework.aop.aspectj.autoproxy.MultiplyReturnValue">
 		<property name="multiple" value="2"/>
 	</bean>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml
index abf8f91b90..ae6b4022b3 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml
@@ -5,12 +5,12 @@
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
 
-     
+    
     <!--
-	<bean 
+	<bean
 		class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator" />
 	-->
-	
+
 	<aop:aspectj-autoproxy proxy-target-class="true" expose-proxy="true"/>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
index 53c2a50c66..1ce4bb03d9 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
@@ -8,9 +8,9 @@
 	<!--
 	<bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator" />
 	-->
-	
+
 	<aop:aspectj-autoproxy/>
-	
+
 	<bean class="org.springframework.aop.aspectj.autoproxy.MultiplyReturnValue">
 		<property name="multiple" value="2"/>
 	</bean>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
index efb221722a..20b59bc562 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
@@ -9,12 +9,12 @@
 			scope="prototype">
 		<property name="order" value="5"/>
 	</bean>
-		
+	
 	<bean id="adrian" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
 		<property name="name" value="adrian"/>
 		<property name="age" value="34"/>
 	</bean>
-	
+
 	<bean id="juergen" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
 		<property name="name" value="juergen"/>
 		<property name="age" value="30"/>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
index a01be310d1..d70f8548dc 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
@@ -8,5 +8,5 @@
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
 
 	<bean id="aspect" class="org.springframework.aop.aspectj.autoproxy.ExceptionHandlingAspect"/>
-	
+
 </beans>
\ No newline at end of file
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
index 759e4c8944..70b5d397b9 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
@@ -5,28 +5,28 @@
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-     
+    
     <!--
-	<bean 
+	<bean
 		class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator" />
 	-->
-	
+
 	<aop:aspectj-autoproxy/>
-	
-	<bean 
+
+	<bean
 		class="org.springframework.aop.aspectj.autoproxy.MultiplyReturnValue" >
 		<property name="multiple" value="2" />
 	</bean>
-	
-	<bean 
+
+	<bean
 		class="org.springframework.aop.aspectj.autoproxy.benchmark.TraceAspect" >
 	</bean>
-		
+	
 	<bean id="adrian" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name" value="adrian" />
 		<property name="age" value="34" />
 	</bean>
-	
-	
-	
+
+
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml
index f70a7a15c0..4ebb1b8cde 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml
@@ -7,8 +7,8 @@
 
 	<aop:aspectj-autoproxy/>
 
-	<bean id="service" class="org.springframework.aop.aspectj.autoproxy.spr3064.ServiceImpl"/>	
+	<bean id="service" class="org.springframework.aop.aspectj.autoproxy.spr3064.ServiceImpl"/>
 
-	<bean id="transactionInterceptor" class="org.springframework.aop.aspectj.autoproxy.spr3064.TransactionInterceptor"/>	
+	<bean id="transactionInterceptor" class="org.springframework.aop.aspectj.autoproxy.spr3064.TransactionInterceptor"/>
 
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml
index 3b53bf5064..d0bb6a3cde 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> 
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="http://www.springframework.org/schema/beans"
 		xmlns:aop="http://www.springframework.org/schema/aop"
diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml
index 8e662cc333..65a4515edb 100644
--- a/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> 
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="http://www.springframework.org/schema/beans"
 		xmlns:aop="http://www.springframework.org/schema/aop"
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
index 4e098059b5..e9f8825b5b 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
@@ -7,7 +7,7 @@
 
 	<aop:config>
 		<aop:aspect id="countAgeCalls" ref="countingAdvice">
-			<aop:before pointcut="execution(* setAge(..)) and args(age) and this(bean)" 
+			<aop:before pointcut="execution(* setAge(..)) and args(age) and this(bean)"
 					method="mySetAgeAdvice" arg-names="age,bean"/>
 		</aop:aspect>
 	</aop:config>
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/PrototypeProxyTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/config/PrototypeProxyTests-context.xml
index b1327c8bdb..cf2e3ca91d 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/PrototypeProxyTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/PrototypeProxyTests-context.xml
@@ -19,7 +19,7 @@
 
 	<bean id="serviceInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
 
-	<aop:config proxy-target-class="false"> 
+	<aop:config proxy-target-class="false">
 		<aop:pointcut id="servicePointcut" expression="target(org.springframework.tests.sample.beans.ITestBean)"/>
 		<aop:advisor advice-ref="serviceInterceptor" pointcut-ref="servicePointcut"/>
 	</aop:config>
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
index dde1f91017..7eccd715a7 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
@@ -4,10 +4,10 @@
 <!--
 	Tests for misconfiguring the proxy factory bean using a target source in the
 	interceptor list as well as set by the targetSource property
--->	
+-->
 
 <beans>
-	
+
 	<bean id="eveTargetSource" class="org.springframework.aop.target.SingletonTargetSource">
 		<constructor-arg>
 			<bean class="org.springframework.tests.sample.beans.TestBean">
@@ -15,40 +15,40 @@
 			</bean>
 		</constructor-arg>
 	</bean>
-	
+
 	<bean id="adam" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Adam</value></property>
 	</bean>
-	
+
 	<bean id="adamTargetSource" class="org.springframework.aop.target.SingletonTargetSource">
 		<constructor-arg>
 			<ref local="adam"/>
 		</constructor-arg>
 	</bean>
-	
+
 	<bean id="countingBeforeAdvice"
 		class="org.springframework.tests.aop.advice.CountingBeforeAdvice"
 	/>
-	
+
 	<bean id="doubleTarget"
-		class="org.springframework.aop.framework.ProxyFactoryBean"> 
+		class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="proxyInterfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
 		<!-- this is the one used and NOT the one set by targetSource -->
 		<property name="interceptorNames"><value>countingBeforeAdvice,adamTargetSource</value></property>
-		
+	
 		<property name="targetSource"><ref bean="eveTargetSource"/></property>
 	</bean>
-	
+
 	<!-- but this is also possible -->
 	<bean id="arbitraryTarget"
-		class="org.springframework.aop.framework.ProxyFactoryBean"> 
+		class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="proxyInterfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
 		<!-- this is the one used and NOT the one set by targetSource -->
 		<property name="interceptorNames"><value>adam</value></property>
 		<property name="targetSource"><ref local="eveTargetSource"/></property>
 	</bean>
 
-		
-</beans>		
-	
 	
+</beans>	
+
+
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
index 47cd14f94d..2c2a9f99e9 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
@@ -4,31 +4,31 @@
 <!--
 	Tests for misconfiguring the proxy factory bean using a target source in the
 	interceptor list as well as set by the targetSource property
--->	
+-->
 
 <beans>
-	
-	
+
+
 	<bean id="adam" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Adam</value></property>
 	</bean>
-	
+
 	<bean id="countingBeforeAdvice"
 		class="org.springframework.tests.aop.advice.CountingBeforeAdvice"
 	/>
-	
+
 	<!--
        An error, as the target source or non-advice object
        must be last
-    --> 
-	<bean id="targetSourceNotLast" 
-		class="org.springframework.aop.framework.ProxyFactoryBean"> 
+    -->
+	<bean id="targetSourceNotLast"
+		class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="proxyInterfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
 		<!-- this is the one used and NOT the one set by targetSource -->
 		<property name="interceptorNames"><value>adam,countingBeforeAdvice</value></property>
-		
+	
 	</bean>
-		
-</beans>		
-	
 	
+</beans>	
+
+
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
index 291385ce50..bda6f41c41 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
@@ -10,7 +10,7 @@
 	<bean id="test" class="org.springframework.tests.sample.beans.SideEffectBean">
 		<property name="count"><value>10</value></property>
 	</bean>
-	
+
 	<bean id="prototypeTarget" class="org.springframework.tests.sample.beans.SideEffectBean" scope="prototype">
 		<property name="count"><value>10</value></property>
 	</bean>
@@ -25,7 +25,7 @@
 		<property name="interceptorNames"><value>debugInterceptor,prototypeTarget</value></property>
 		<property name="singleton"><value>false</value></property>
 	</bean>
-	
+
 	<bean id="cglibPrototype"
 		class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="interceptorNames"><value>debugInterceptor,prototypeTarget</value></property>
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml b/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
index a58e040b67..c4c7718e5f 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
@@ -4,20 +4,20 @@
 <beans>
 
 	<bean id="testBeanTarget" class="org.springframework.tests.sample.beans.TestBean"/>
-	
+
 	<bean id="simpleBeforeAdvice" class="org.springframework.aop.framework.adapter.SimpleBeforeAdviceImpl"/>
-	
+
 	<bean id="simpleBeforeAdviceAdvisor" class="org.springframework.aop.support.DefaultPointcutAdvisor">
 		<constructor-arg><ref local="simpleBeforeAdvice"/></constructor-arg>
 	</bean>
-   	
+   
 	<bean id="testBean" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="proxyInterfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
 		<property name="interceptorNames"><value>simpleBeforeAdviceAdvisor,testBeanTarget</value></property>
 	</bean>
-	
+
 	<bean id="testAdvisorAdapter" class="org.springframework.aop.framework.adapter.SimpleBeforeAdviceAdapter"/>
-	
+
 	<bean id="adapterRegistrationManager" class="org.springframework.aop.framework.adapter.AdvisorAdapterRegistrationManager"/>
 
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml b/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
index 69bd476f3b..41480a512e 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
-	
+
 	<bean id="testBeanTarget" class="org.springframework.tests.sample.beans.TestBean"/>
-	
+
 	<bean id="simpleBeforeAdvice" class="org.springframework.aop.framework.adapter.SimpleBeforeAdviceImpl"/>
-	
+
 	<bean id="simpleBeforeAdviceAdvisor" class="org.springframework.aop.support.DefaultPointcutAdvisor">
 		<constructor-arg><ref local="simpleBeforeAdvice"/></constructor-arg>
 	</bean>
-   	
+   
 	<bean id="testBean" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="proxyInterfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
 		<property name="interceptorNames"><value>simpleBeforeAdviceAdvisor,testBeanTarget</value></property>
 	</bean>
-	
+
 	<bean id="testAdvisorAdapter" class="org.springframework.aop.framework.adapter.SimpleBeforeAdviceAdapter"/>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
index c64c7e6ef7..08486fba19 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
@@ -12,7 +12,7 @@
 
 	<bean id="aapc"
 		class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator">
-		
+	
 		<!-- This common interceptor will be applied always,
 		before custom lockable advisor -->
 		<property name="interceptorNames">
@@ -30,18 +30,17 @@
 		class="test.mixin.LockMixinAdvisor"
 		scope="prototype"
 	/>
-	
+
 	<bean id="test1"
 		class="org.springframework.tests.sample.beans.TestBean">
 		<property name="age"><value>4</value></property>
 	</bean>
-	
+
 	<bean id="test2"
 		class="org.springframework.tests.sample.beans.TestBean">
 		<property name="age"><value>4</value></property>
 	</bean>
-	
 
-</beans>		
-	
-	
\ No newline at end of file
+
+</beans>	
+
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
index 4600ffd4a4..d3416282a7 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
@@ -10,7 +10,7 @@
 			</list>
 		</property>
 	</bean>
-	
+
 	<bean id="aapc.quickTargetSourceCreator"
 		class="org.springframework.aop.framework.autoproxy.target.QuickTargetSourceCreator"/>
 
@@ -18,27 +18,27 @@
 		<property name="name"><value>Rod</value></property>
 		<property name="spouse"><ref local="wife"/></property>
 	</bean>
-	
+
 	<bean id="wife" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Kerry</value></property>
 	</bean>
-	
+
 	<!-- Prefix means it will be pooled -->
 	<bean id=":test" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Rod</value></property>
 		<property name="spouse"><ref local="wife"/></property>
 	</bean>
-	
+
 	<!-- Prefix means it will be thread local -->
 	<bean name="%test" scope="prototype" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Rod</value></property>
 		<property name="spouse"><ref local="wife"/></property>
 	</bean>
-	
+
 	<!-- Prefix means it will be a prototype target source -->
 	<bean name="!test" scope="prototype" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Rod</value></property>
 		<property name="spouse"><ref local="wife"/></property>
 	</bean>
 
-</beans>		
+</beans>	
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
index d53272f0d5..b3271fa0e6 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
@@ -26,4 +26,4 @@
 
 	<bean id="bean" class="org.springframework.tests.sample.beans.TestBean"/>
 
-</beans>		
+</beans>	
diff --git a/spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-override.xml b/spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-override.xml
index 98587609b1..768e429c2f 100644
--- a/spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-override.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-override.xml
@@ -7,7 +7,7 @@
 
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean" scope="request">
     <aop:scoped-proxy proxy-target-class="false"/>
-    <property name="age" value="99"/> 
+    <property name="age" value="99"/>
   </bean>
 
   <bean class="org.springframework.beans.factory.config.PropertyOverrideConfigurer">
diff --git a/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml
index 0ce6259001..23f3e51230 100644
--- a/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
-	
+
 	<bean id="prototypeTest" class="org.springframework.tests.sample.beans.SideEffectBean" scope="prototype">
 		<property name="count"><value>10</value></property>
 	</bean>
-	
+
 	<bean id="poolTargetSource" class="org.springframework.aop.target.CommonsPool2TargetSource">
 		<property name="targetBeanName"><value>prototypeTest</value></property>
 		<property name="maxSize"><value>25</value></property>
 	</bean>
-	
+
 	<bean id="poolConfigAdvisor" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<property name="targetObject"><ref local="poolTargetSource" /></property>
 		<property name="targetMethod"><value>getPoolingConfigMixin</value></property>
 	</bean>
-	
+
 	<bean id="nop" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
 
 	<!--
@@ -26,11 +26,11 @@
 		<property name="targetSource"><ref local="poolTargetSource"/></property>
 		<property name="interceptorNames"><value>nop</value></property>
 	</bean>
-	
+
 	<bean id="pooledNoInterceptors"  class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="targetSource"><ref local="poolTargetSource"/></property>
 	</bean>
-	
+
 	<bean id="pooledWithMixin" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="targetSource"><ref local="poolTargetSource"/></property>
 		<property name="interceptorNames"><value>poolConfigAdvisor</value></property>
@@ -41,18 +41,18 @@
 
 	<!-- Serialization tests using serializable target and advice -->
 	<bean id="serializableNop" class="org.springframework.tests.aop.interceptor.SerializableNopInterceptor" />
-	
+
 	<bean id="prototypePerson" class="org.springframework.tests.sample.beans.SerializablePerson" scope="prototype"/>
 
 	<bean id="personPoolTargetSource" class="org.springframework.aop.target.CommonsPool2TargetSource">
 		<property name="targetBeanName"><value>prototypePerson</value></property>
 		<property name="maxSize"><value>10</value></property>
 	</bean>
-	
+
 	<bean id="pooledPerson" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="targetSource"><ref local="personPoolTargetSource"/></property>
 		<property name="interceptorNames"><value>serializableNop</value></property>
-		
+	
 	</bean>
 
 	<bean id="maxSizePooledPerson" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -66,4 +66,4 @@
 		<property name="interceptorNames"><value>serializableNop</value></property>
 	</bean>
 
-</beans>		
+</beans>	
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
index 9eaf910d08..ab468576a5 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
@@ -2,38 +2,38 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
-	
-	<!-- 
+
+	<!--
 		Not yet in use: illustration of possible approach.
 	-->
 	<bean id="autoProxiedOverload" lazy-init="true"
 			class="org.springframework.beans.factory.xml.OverloadLookup">
 		<lookup-method name="newTestBean" bean="jenny"/>
 	</bean>
-	
+
 	<bean id="regularlyProxiedOverloadTarget"  scope="prototype"
 			class="org.springframework.beans.factory.xml.OverloadLookup">
 		<lookup-method name="newTestBean" bean="jenny"/>
 	</bean>
-	
+
 	<bean id="regularlyProxiedOverload" lazy-init="true" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="target"><ref local="regularlyProxiedOverloadTarget"/></property>
 		<property name="proxyTargetClass"><value>true</value></property>
 		<property name="interceptorNames"><value>interceptor</value></property>
 	</bean>
-	
+
 	<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
 		<property name="name"><value>Jenny</value></property>
 		<property name="age"><value>30</value></property>
 	</bean>
-	
+
 	<!-- Add autoproxy -->
 	<bean class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
 		<property name="beanNames"><value>autoProxiedOverload</value></property>
 		<property name="proxyTargetClass"><value>true</value></property>
 		<property name="interceptorNames"><value>interceptor</value></property>
 	</bean>
-	
+
 	<bean id="interceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
index 2f7db21056..00f966f6f2 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
@@ -58,5 +58,5 @@
     <bean id="thetaFactory" class="org.springframework.beans.factory.xml.QualifierAnnotationTests$QualifiedFactoryBean"/>
 
     <bean id="thetaImpl" class="org.springframework.beans.factory.xml.QualifierAnnotationTests$ThetaImpl"/>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
index fc90f7905c..44ca56ef3a 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
@@ -7,7 +7,7 @@
 		<property name="name"><value>override</value></property>
 		<!-- age should inherit value of 1 from parent -->
 	</bean>
-	
+
 	<bean id="inheritsWithDifferentClass" class="org.springframework.tests.sample.beans.DerivedTestBean"
 			parent="inheritedTestBean" init-method="initialize">
 		<property name="name"><value>override</value></property>
@@ -24,17 +24,17 @@
 		<property name="name"><value>prototypeOverridesInheritedSingleton</value></property>
 		<!-- age should inherit value of 1 from parent -->
 	</bean>
-	
+
 	<bean id="prototypeInheritsFromParentFactoryPrototype" parent="inheritedTestBeanPrototype" scope="prototype">
 		<property name="name"><value>prototype-override</value></property>
 		<!-- age should inherit value of 2 from parent -->
 	</bean>
-	
+
 	<bean id="singletonInheritsFromParentFactoryPrototype" parent="inheritedTestBeanPrototype" scope="singleton">
 		<property name="name"><value>prototype-override</value></property>
 		<!-- age should inherit value of 2 from parent -->
 	</bean>
-	
+
 	<bean id="inheritedTestBean" parent="inheritedTestBean">
 		<property name="name"><value>overrideParentBean</value></property>
 		<!-- age should inherit value of 1 from parent -->
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
index 8370424f73..f041b65634 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
@@ -17,7 +17,7 @@
 		<property name="proxyInterfaces" value="org.springframework.tests.sample.beans.ITestBean"/>
 		<property name="targetName" value="target2"/>
 	</bean>
-	
+
 	<bean id="target2" class="org.springframework.tests.sample.beans.DependenciesBean">
 		<property name="spouse">
 			<bean class="org.springframework.tests.sample.beans.TestBean">
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
index d703fddd21..07501022a5 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
@@ -3,28 +3,28 @@
 
 <beans>
 
-	<bean id="constructorOverrides" 
+	<bean id="constructorOverrides"
 		class="org.springframework.beans.factory.xml.ConstructorInjectedOverrides"
 		autowire="autodetect">
-		
+	
 		<!--
 			We combine a setter method with constructor
 			autowiring
 		-->
 		<property name="setterString"><value>from property element</value></property>
-		
-		<lookup-method name="createFactoryMethods" bean="factoryMethods" />		
-		
+	
+		<lookup-method name="createFactoryMethods" bean="factoryMethods" />	
+	
 	</bean>
-	
-	
+
+
 	<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean"
 		scope="singleton">
 		<property name="name"><value>Jenny</value></property>
 		<property name="age"><value>30</value></property>
 	</bean>
-	
-	<bean id="factoryMethods" 
+
+	<bean id="factoryMethods"
 		class="org.springframework.beans.factory.xml.FactoryMethods"
 		factory-method="newInstance"
 		scope="prototype">
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
index cd232df3c0..5fd7f5b40d 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
@@ -5,17 +5,17 @@
 
 	<bean id="constructorOverrides" class="org.springframework.beans.factory.xml.ConstructorInjectedOverrides"
 		autowire="autodetect">
-		
+	
 		<!-- No such lookup method -->
 		<lookup-method name="bogusMethod" bean="dummyBo" />
-	
+
 	</bean>
 
 	<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean" scope="singleton">
 		<property name="name"><value>Jenny</value></property>
 		<property name="age"><value>30</value></property>
 	</bean>
-	
+
 	<bean id="factoryMethods"  class="org.springframework.beans.factory.xml.FactoryMethods"
 			factory-method="newInstance" scope="prototype">
 		<constructor-arg index="0"><ref local="jenny"/></constructor-arg>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
index 2e49f71a54..496636214f 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
@@ -6,7 +6,7 @@
            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
 	<!-- just ensures that one can use <ref local=""/> to refer to the various <util:collections/> types -->
-	
+
 	<util:map id="map"/>
 	<util:list id="list"/>
 	<util:set id="set"/>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml
index 251459cf61..854490f192 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml
@@ -3,15 +3,15 @@
 
 <beans>
 
-	
+
 	<bean id="default" class="org.springframework.beans.factory.xml.FactoryMethods"
 			factory-method="defaultInstance">
 		<!-- No constructor-arg elements -->
 		<property name="stringValue"><value>setterString</value></property>
 	</bean>
-	
+
 	<bean id="defaultTestBean" factory-bean="default" factory-method="xgetTestBean"
 			init-method="haveBirthday" destroy-method="destroy"/>
-			
+		
 
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
index 7b94a9504a..739565b06a 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
@@ -7,7 +7,7 @@
 		<lookup-method name="getPrototypeDependency" bean="jenny"/>
 		<lookup-method name="protectedOverrideSingleton" bean="david"/>
 	</bean>
-	
+
 	<!--
 		Test that overrides work on an inherited method
 	-->
@@ -15,7 +15,7 @@
 		<lookup-method name="getPrototypeDependency" bean="jenny"/>
 		<lookup-method name="protectedOverrideSingleton" bean="david"/>
 	</bean>
-	
+
 	<!--
 		We can use this to test the construction cost of beans with method overrides
 	-->
@@ -33,8 +33,8 @@
 		<lookup-method name="getPrototypeDependency" bean="david"/>
 		<lookup-method name="protectedOverrideSingleton" bean="jenny"/>
 	</bean>
-	
-	
+
+
 	<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
 		<property name="name"><value>Jenny</value></property>
 		<property name="age"><value>30</value></property>
@@ -45,7 +45,7 @@
 			<bean class="org.springframework.tests.sample.beans.TestBean"/>
 		</property>
 	</bean>
-	
+
 	<bean id="jennyParent" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>Jenny</value></property>
 		<property name="age"><value>30</value></property>
@@ -70,12 +70,12 @@
 		</property>
 		<property name="age"><value>27</value></property>
 	</bean>
-	
+
 	<bean id="magicDavid" class="org.springframework.tests.sample.beans.TestBean" autowire="byName"/>
-	
+
 	<!--  this should be autowired as well! -->
 	<bean id="magicDavidDerived" parent="magicDavid" />
-	
+
 	<bean id="spouse" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name" value="Linda"/>
 	</bean>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
index 789ecd9951..4170370aa1 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
@@ -3,6 +3,6 @@
 
 <beans>
 
-	<import resource="XmlBeanFactoryTests-recursiveImport.xml"/> 
+	<import resource="XmlBeanFactoryTests-recursiveImport.xml"/>
 
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
index 5dbbd2a690..a48a32673f 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
@@ -3,7 +3,7 @@
 
 <beans>
 
-	<import resource="XmlBeanFactoryTests-resourceImport.xml"/> 
+	<import resource="XmlBeanFactoryTests-resourceImport.xml"/>
 
 	<bean id="resource2" class="org.springframework.tests.sample.beans.ResourceTestBean">
 		<constructor-arg index="0" value="classpath:org/springframework/beans/factory/xml/test.properties"/>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
index daa269998e..18f3c8e1b8 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
@@ -9,7 +9,7 @@
 		<property name="age"><value>33</value></property>
 		<property name="name"><value>Rod</value></property>
 	</bean>
-	
+
 	<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean"
 		dependency-check="none">
 	</bean>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
index 65fbd833c9..a2dcc80418 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
@@ -6,7 +6,7 @@
 	<bean id="a" class="org.springframework.tests.sample.beans.DependenciesBean" dependency-check="objects">
 		<property name="spouse"><ref local="kerry"/></property>
 	</bean>
-	
+
 	<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean" dependency-check="none">
 	</bean>
 
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
index a771266aa9..3178c38e14 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
@@ -8,7 +8,7 @@
 		<property name="age"><value>33</value></property>
 		<property name="name"><value>Rod</value></property>
 	</bean>
-	
-	
+
+
 
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
index 8cd2e72569..1a7bbf9c7c 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
@@ -8,7 +8,7 @@
 		<property name ="name"><value>tony</value></property>
 		<property name="spouse"><ref local="kerry"></property> -->
 	</bean>
-	
+
 	<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean"
 		dependency-check="none">
 	</bean>
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
index 1b95433a63..01092c1278 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
@@ -6,9 +6,9 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="proxiedXmlBean" class="org.springframework.tests.sample.beans.TestBean"/>
-	
+
 	<bean id="anAspect" class="org.springframework.context.annotation.configuration.ImportResourceTests$AnAspect"/>
-	
+
 	<aop:aspectj-autoproxy>
 		<aop:include name="anAspect"/>
 	</aop:aspectj-autoproxy>
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByNameTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByNameTests.xml
index ea5fd0061c..04e1d8f42b 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByNameTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByNameTests.xml
@@ -9,7 +9,7 @@
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
             annotation-config="false">
-        <context:include-filter type="assignable" 
+        <context:include-filter type="assignable"
                 expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
     </context:component-scan>
 
@@ -21,7 +21,7 @@
         <constructor-arg value="pd1"/>
     </bean>
 
-    <bean id="propertyDependency2" 
+    <bean id="propertyDependency2"
           class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
         <constructor-arg value="pd2"/>
     </bean>
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByTypeTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByTypeTests.xml
index 03dc019f40..fdbcee6db4 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByTypeTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByTypeTests.xml
@@ -9,7 +9,7 @@
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
             annotation-config="false">
-        <context:include-filter type="assignable" 
+        <context:include-filter type="assignable"
                 expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
     </context:component-scan>
 
@@ -21,7 +21,7 @@
         <constructor-arg value="pd1"/>
     </bean>
 
-    <bean id="propertyDependency2" 
+    <bean id="propertyDependency2"
           class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
         <constructor-arg value="pd2"/>
     </bean>
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireConstructorTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireConstructorTests.xml
index 4431641a7e..43a3018d25 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireConstructorTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireConstructorTests.xml
@@ -9,7 +9,7 @@
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
             annotation-config="false">
-        <context:include-filter type="assignable" 
+        <context:include-filter type="assignable"
                 expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
     </context:component-scan>
 
@@ -21,7 +21,7 @@
         <constructor-arg value="pd1"/>
     </bean>
 
-    <bean id="propertyDependency2" 
+    <bean id="propertyDependency2"
           class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
         <constructor-arg value="pd2"/>
     </bean>
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireNoTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireNoTests.xml
index cd7930f690..b297e22c2d 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireNoTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireNoTests.xml
@@ -9,7 +9,7 @@
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
             annotation-config="false">
-        <context:include-filter type="assignable" 
+        <context:include-filter type="assignable"
                 expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
     </context:component-scan>
 
@@ -21,7 +21,7 @@
         <constructor-arg value="pd1"/>
     </bean>
 
-    <bean id="propertyDependency2" 
+    <bean id="propertyDependency2"
           class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
         <constructor-arg value="pd2"/>
     </bean>
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
index 46cbe2adb7..c5a1c36a97 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
@@ -9,7 +9,7 @@
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
             annotation-config="false">
-        <context:include-filter type="assignable" 
+        <context:include-filter type="assignable"
                 expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
     </context:component-scan>
 
@@ -21,7 +21,7 @@
         <constructor-arg value="pd1"/>
     </bean>
 
-    <bean id="propertyDependency2" 
+    <bean id="propertyDependency2"
           class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
         <constructor-arg value="pd2"/>
     </bean>
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
index 505cb3b4b4..0a9babdbd2 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
@@ -10,7 +10,7 @@
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
             annotation-config="false">
-        <context:include-filter type="assignable" 
+        <context:include-filter type="assignable"
                 expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
     </context:component-scan>
 
@@ -19,7 +19,7 @@
         <constructor-arg value="pd1"/>
     </bean>
 
-    <bean id="propertyDependency2" 
+    <bean id="propertyDependency2"
           class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
         <constructor-arg value="pd2"/>
     </bean>
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitFalseTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitFalseTests.xml
index b16bae4cda..1cfbac0312 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitFalseTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitFalseTests.xml
@@ -9,7 +9,7 @@
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
             annotation-config="false">
-        <context:include-filter type="assignable" 
+        <context:include-filter type="assignable"
                 expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
     </context:component-scan>
 
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitTrueTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitTrueTests.xml
index ed11edfa2b..1e023ccf11 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitTrueTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitTrueTests.xml
@@ -9,7 +9,7 @@
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
             annotation-config="false">
-        <context:include-filter type="assignable" 
+        <context:include-filter type="assignable"
                 expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
     </context:component-scan>
 
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultWithNoOverridesTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultWithNoOverridesTests.xml
index adfc3aa442..2e39c565b7 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultWithNoOverridesTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/defaultWithNoOverridesTests.xml
@@ -8,7 +8,7 @@
 	<context:component-scan base-package="org.springframework.context.annotation"
             use-default-filters="false"
             annotation-config="false">
-        <context:include-filter type="assignable" 
+        <context:include-filter type="assignable"
                 expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
     </context:component-scan>
 
@@ -20,7 +20,7 @@
         <constructor-arg value="pd1"/>
     </bean>
 
-    <bean id="propertyDependency2" 
+    <bean id="propertyDependency2"
           class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
         <constructor-arg value="pd2"/>
     </bean>
diff --git a/spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml b/spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml
index 52d7da5495..50cbe884df 100644
--- a/spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml
+++ b/spring-context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml
@@ -53,5 +53,5 @@
 	</bean>
 
 	<context:annotation-config />
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml b/spring-context/src/test/resources/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
index 6c95987712..24350d1ff2 100644
--- a/spring-context/src/test/resources/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
+++ b/spring-context/src/test/resources/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
@@ -3,7 +3,7 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-	<import resource="ClassPathXmlApplicationContextTests-resourceIm*.xml"/> 
+	<import resource="ClassPathXmlApplicationContextTests-resourceIm*.xml"/>
 
 	<bean id="resource2" class="org.springframework.tests.sample.beans.ResourceTestBean">
 		<constructor-arg name="inputStream">
diff --git a/spring-context/src/test/resources/org/springframework/context/support/spr7283.xml b/spring-context/src/test/resources/org/springframework/context/support/spr7283.xml
index 22da9c457e..2f2837d0a0 100644
--- a/spring-context/src/test/resources/org/springframework/context/support/spr7283.xml
+++ b/spring-context/src/test/resources/org/springframework/context/support/spr7283.xml
@@ -12,5 +12,5 @@
 		<bean class="org.springframework.context.support.Spr7283Tests$A"/>
 		<bean class="org.springframework.context.support.Spr7283Tests$B"/>
 	</util:list>
-    
+   
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/context/support/spr7816.xml b/spring-context/src/test/resources/org/springframework/context/support/spr7816.xml
index 4c399578a8..dcc2bc0ceb 100644
--- a/spring-context/src/test/resources/org/springframework/context/support/spr7816.xml
+++ b/spring-context/src/test/resources/org/springframework/context/support/spr7816.xml
@@ -15,5 +15,5 @@
 			</map>
 		</constructor-arg>
 	</bean>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/context/support/test/aliased-contextC.xml b/spring-context/src/test/resources/org/springframework/context/support/test/aliased-contextC.xml
index 3c46c30820..1757bdc57d 100644
--- a/spring-context/src/test/resources/org/springframework/context/support/test/aliased-contextC.xml
+++ b/spring-context/src/test/resources/org/springframework/context/support/test/aliased-contextC.xml
@@ -11,7 +11,7 @@
 		<!--<property name="assembler"><ref bean="assemblerOne"/></property>-->
 		<property name="assembler"><ref bean="myTarget"/></property>
 	</bean>
-	
+
 	<alias name="${targetName}" alias="myTarget"/>
 
 	<alias name="${realLogicName}" alias="${logicName}"/>
diff --git a/spring-context/src/test/resources/org/springframework/context/support/test/contextB.xml b/spring-context/src/test/resources/org/springframework/context/support/test/contextB.xml
index 261ce0698b..d96202ad38 100644
--- a/spring-context/src/test/resources/org/springframework/context/support/test/contextB.xml
+++ b/spring-context/src/test/resources/org/springframework/context/support/test/contextB.xml
@@ -7,5 +7,5 @@
 		<!--<property name="assembler"><ref bean="assemblerTwo"/></property>-->
 		<property name="assembler"><ref bean="wrappedAssemblerTwo"/></property>
 	</bean>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/context/support/test/contextC.xml b/spring-context/src/test/resources/org/springframework/context/support/test/contextC.xml
index c1abb93e2a..6a57770790 100644
--- a/spring-context/src/test/resources/org/springframework/context/support/test/contextC.xml
+++ b/spring-context/src/test/resources/org/springframework/context/support/test/contextC.xml
@@ -13,5 +13,5 @@
 		<!--<property name="assembler"><ref bean="assemblerOne"/></property>-->
 		<property name="assembler"><ref bean="${targetName}"/></property>
 	</bean>
-	
+
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml b/spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
index e8767251a9..6825563dc9 100644
--- a/spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
+++ b/spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
@@ -67,7 +67,7 @@
       cache-session-bean="true">
 		<jee:environment>foo=bar</jee:environment>
 	</jee:remote-slsb>
-	
+
 	<!-- Lazy beans Tests-->
 	<jee:jndi-lookup id="lazyDataSource" jndi-name="jdbc/MyDataSource" lazy-init="true" />
 	<jee:local-slsb id="lazyLocalBean" jndi-name="ejb/MyLocalBean"
diff --git a/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml b/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml
index 4413e29b33..60ea74676e 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml
@@ -56,7 +56,7 @@
 <lang:inline-script><![CDATA[
 int count;
 void onApplicationEvent (org.springframework.context.ApplicationEvent event) { count++; System.out.println(event); }
-String getMessage() { return "count=" + count; } 
+String getMessage() { return "count=" + count; }
 ]]></lang:inline-script>
 </lang:bsh>
 
diff --git a/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml b/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
index e571ce2c88..f2b59c5ee8 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
@@ -14,7 +14,7 @@
 
 	<lang:groovy id="testBean" name="/url" script-source="classpath:org/springframework/scripting/config/TestBean.groovy"/>
 
-	<lang:groovy id="nonRefreshableTestBean" refresh-check-delay="-1" 
+	<lang:groovy id="nonRefreshableTestBean" refresh-check-delay="-1"
 			script-source="classpath:org/springframework/scripting/config/TestBean.groovy"/>
 
 	<bean id="otherBean" class="org.springframework.scripting.config.OtherTestBean"/>
diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators-with-xsd.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators-with-xsd.xml
index 8c90f9b267..972413f7d1 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators-with-xsd.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators-with-xsd.xml
@@ -3,8 +3,8 @@
 		xmlns:lang="http://www.springframework.org/schema/lang"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
-	
-	<lang:groovy id="calculator" 
+
+	<lang:groovy id="calculator"
 		script-source="classpath:org/springframework/scripting/groovy/Calculator.groovy"
 		customizer-ref="testCustomizer" />
 
diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators.xml
index b936acc96e..e0d22d9f15 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators.xml
@@ -11,14 +11,14 @@
 		<constructor-arg>
 			<bean class="org.springframework.scripting.groovy.GroovyScriptFactoryTests$TestCustomizer" />
 		</constructor-arg>
-		
+	
 	</bean>
 
 	<bean id="delegatingCalculator" class="org.springframework.scripting.groovy.GroovyScriptFactory">
 		<constructor-arg value="classpath:org/springframework/scripting/groovy/DelegatingCalculator.groovy"/>
-		
+	
 		<property name="delegate" ref="calculator"/>
-		
+	
 	</bean>
 
 
diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml
index 7603dde14b..58a9b4027b 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml
@@ -5,7 +5,7 @@
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 
 				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd">
-				
+			
 	<lang:defaults  proxy-target-class="true"/>
 
 	<lang:jruby id="refreshableMessenger" refresh-check-delay="1000"
diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/lwspBadGroovyContext.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
index 2d5692534d..99115a2bbe 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
@@ -9,7 +9,7 @@
 			<!-- 'inline:' prefix is preceded by whitespace... -->
 			<value>
     inline:
-				
+			
 	class Bingo {
 
 		@Property String message;
diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
index b32cc8294f..47d863191d 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
@@ -15,7 +15,7 @@
 
 		def String message;
 	}
-				
+			
 	class Bingo {
 
 		def String message;
diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
index c3b4e80f16..d682393e88 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
@@ -10,7 +10,7 @@
 	package org.springframework.scripting.groovy;
 
 	import org.springframework.scripting.Messenger;
-				
+			
 	class Bingo {
 
 		@Property String message;
diff --git a/spring-context/src/test/resources/org/springframework/scripting/jruby/jruby-with-xsd.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/jruby-with-xsd.xml
index 5df3894c08..98536d2ec2 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/jruby/jruby-with-xsd.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/jruby/jruby-with-xsd.xml
@@ -62,7 +62,7 @@ class RubyCalculatingMessenger
  def add(x, y)
 	x + y
  end
- 
+
  def setMessage(message)
 	@@message = message
  end
diff --git a/spring-context/src/test/resources/org/springframework/scripting/support/groovyReferences.xml b/spring-context/src/test/resources/org/springframework/scripting/support/groovyReferences.xml
index 20bc7ee8c9..da7a3fc2d5 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/support/groovyReferences.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/support/groovyReferences.xml
@@ -14,11 +14,11 @@ import org.springframework.scripting.Messenger
 class DelegatingMessenger implements Messenger {
 
 	private Messenger wrappedMessenger;
-	
+
 	public String getMessage() {
 		this.wrappedMessenger.getMessage();
 	}
-	
+
 	public void setMessenger(Messenger wrappedMessenger) {
 		this.wrappedMessenger = wrappedMessenger;
 	}
@@ -26,7 +26,7 @@ class DelegatingMessenger implements Messenger {
 		</constructor-arg>
 		<property name="messenger" ref="wrappedMessenger"/>
 	</bean>
-	
+
 	<bean id="wrappedMessenger" class="org.springframework.scripting.support.StubMessenger"/>
 
 </beans>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
index c8e43922ad..2ee261f99f 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
@@ -9,5 +9,5 @@
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
 		<jdbc:script location="classpath*:org/springframework/jdbc/config/*-data.sql"/>
 	</jdbc:embedded-database>
-		
+	
 </beans>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml
index e8cd36088c..7b8442f220 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-config.xml
@@ -6,7 +6,7 @@
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
-	
+
 	<jdbc:initialize-database data-source="dataSource">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql" execution="INIT"/>
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql" execution="INIT"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml
index 24135d9fd5..894d43de01 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-cache-config.xml
@@ -6,14 +6,14 @@
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
-	
+
 	<jdbc:initialize-database data-source="dataSource">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
 	</jdbc:initialize-database>
 
 	<!-- This cache relies on data created in the initialize-database element.  It works fine
-	if the bean definitions are registered in the right order.  (Could possibly be fixed later.) -->	
+	if the bean definitions are registered in the right order.  (Could possibly be fixed later.) -->
 	<bean class="org.springframework.jdbc.config.InitializeDatabaseIntegrationTests$CacheData">
 		<property name="dataSource" ref="dataSource"/>
 	</bean>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml
index bf31c320cc..2d1fdf3542 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-config.xml
@@ -6,7 +6,7 @@
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
-	
+
 	<jdbc:initialize-database data-source="dataSource" enabled="#{systemProperties['ENABLED']}">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
index 323a21072d..fca53d9b77 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
@@ -11,7 +11,7 @@
 		<jdbc:script location="#{properties['schema.scripts']}" />
 		<jdbc:script location="#{properties['insert.scripts']}" />
 	</jdbc:initialize-database>
-	
+
 	<util:properties id="properties">
 		<prop key="schema.scripts">classpath:org/springframework/jdbc/config/db-schema.sql</prop>
 		<prop key="insert.scripts">classpath*:org/springframework/jdbc/config/*-data.sql</prop>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml
index 45ee2a972b..3c31ae3078 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-fail-config.xml
@@ -6,7 +6,7 @@
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
-	
+
 	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-drops.sql"/>
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml
index 4a6f48300b..41c9450dcf 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml
@@ -6,7 +6,7 @@
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
 	<jdbc:embedded-database id="dataSource" type="HSQL"/>
-	
+
 	<jdbc:initialize-database data-source="dataSource">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
 		<jdbc:script location="classpath*:org/springframework/jdbc/config/*-data.sql"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
index eda2e44809..908653e3fd 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
@@ -15,7 +15,7 @@
 					<constructor-arg index="0" value="amount"/>
 					<constructor-arg index="1">
 						<util:constant static-field="java.sql.Types.INTEGER"/>
-					</constructor-arg> 
+					</constructor-arg>
 				</bean>
 				<bean class="org.springframework.jdbc.core.SqlParameter">
 					<constructor-arg index="0" value="custid"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml
index c46f2f0723..963e0688bc 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml
@@ -15,7 +15,7 @@
 					<constructor-arg index="0" value="amount"/>
 					<constructor-arg index="1">
 						<util:constant static-field="java.sql.Types.INTEGER"/>
-					</constructor-arg> 
+					</constructor-arg>
 				</bean>
 				<bean class="org.springframework.jdbc.core.SqlParameter">
 					<constructor-arg index="0" value="custid"/>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml
index a2aa189832..971ea733f0 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/custom-error-codes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
-	
+
 <beans>
 
 	<!--
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml
index dd3fc33004..17d76ddf27 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/test-error-codes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
-	
+
 <beans>
 
 	<!--
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml
index b44c0a9c1b..ea08edf9be 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/wildcard-error-codes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
-	
+
 <beans>
 
 	<!--
diff --git a/spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
index fc90f7905c..44ca56ef3a 100644
--- a/spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
+++ b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
@@ -7,7 +7,7 @@
 		<property name="name"><value>override</value></property>
 		<!-- age should inherit value of 1 from parent -->
 	</bean>
-	
+
 	<bean id="inheritsWithDifferentClass" class="org.springframework.tests.sample.beans.DerivedTestBean"
 			parent="inheritedTestBean" init-method="initialize">
 		<property name="name"><value>override</value></property>
@@ -24,17 +24,17 @@
 		<property name="name"><value>prototypeOverridesInheritedSingleton</value></property>
 		<!-- age should inherit value of 1 from parent -->
 	</bean>
-	
+
 	<bean id="prototypeInheritsFromParentFactoryPrototype" parent="inheritedTestBeanPrototype" scope="prototype">
 		<property name="name"><value>prototype-override</value></property>
 		<!-- age should inherit value of 2 from parent -->
 	</bean>
-	
+
 	<bean id="singletonInheritsFromParentFactoryPrototype" parent="inheritedTestBeanPrototype" scope="singleton">
 		<property name="name"><value>prototype-override</value></property>
 		<!-- age should inherit value of 2 from parent -->
 	</bean>
-	
+
 	<bean id="inheritedTestBean" parent="inheritedTestBean">
 		<property name="name"><value>overrideParentBean</value></property>
 		<!-- age should inherit value of 1 from parent -->
diff --git a/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml
index 3ce1da843c..8d49befa0d 100644
--- a/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml
+++ b/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <beans>
-	
+
 	<import resource="classpath:/org/springframework/orm/jpa/multi-jpa-emf.xml"/>
 
 	<bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
@@ -18,5 +18,5 @@
 			</props>
 		</property>
 	</bean>
-    
+   
 </beans>
diff --git a/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-complex.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-complex.xml
index 20ace4575a..bd7d4b805a 100644
--- a/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-complex.xml
+++ b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-complex.xml
@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
 	version="1.0">
-	
+
 	<persistence-unit name="pu1" transaction-type="RESOURCE_LOCAL">
 		<description>
 			This unit manages inventory for auto parts. It depends on
diff --git a/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example1.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example1.xml
index 60381ff19a..43e9449cf1 100644
--- a/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example1.xml
+++ b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example1.xml
@@ -3,6 +3,6 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
           http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
 	version="1.0">
-	
+
 	<persistence-unit name="OrderManagement" />
 </persistence>
\ No newline at end of file
diff --git a/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example2.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example2.xml
index dbcaf71863..ded4f0edfb 100644
--- a/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example2.xml
+++ b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example2.xml
@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
 	version="1.0">
-	
+
 	<persistence-unit name="OrderManagement2">
 		<mapping-file>mappings.xml</mapping-file>
 	</persistence-unit>
diff --git a/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example4.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example4.xml
index 014c67d0fb..b851c51881 100644
--- a/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example4.xml
+++ b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example4.xml
@@ -8,11 +8,11 @@
 		<non-jta-data-source>jdbc/MyDB</non-jta-data-source>
 		<mapping-file>order-mappings.xml</mapping-file>
 
-		<class>com.acme.Order</class>		
+		<class>com.acme.Order</class>	
 		<class>com.acme.Customer</class>
 		<class>com.acme.Item</class>
 		<exclude-unlisted-classes />
-		
+	
 	</persistence-unit>
 
 </persistence>
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml b/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
index 1575171042..bf4450fd93 100644
--- a/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
+++ b/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
@@ -24,7 +24,7 @@
 	</oxm:jaxb2-marshaller>
 
 	<!-- Castor -->
-	
+
 	<oxm:castor-marshaller id="castorEncodingMarshaller" encoding="ISO-8859-1"/>
 
 	<oxm:castor-marshaller id="castorTargetClassMarshaller" target-class="org.springframework.oxm.castor.Flight"/>
diff --git a/spring-tx/src/test/resources/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml b/spring-tx/src/test/resources/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
index a707e84fd3..b4a8e160fe 100644
--- a/spring-tx/src/test/resources/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
+++ b/spring-tx/src/test/resources/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
@@ -15,7 +15,7 @@
 	<bean id="transactionManager1" class="org.springframework.tests.transaction.CallCountingTransactionManager">
 		<qualifier value="synch"/>
 	</bean>
-	
+
 	<bean id="transactionManager2" class="org.springframework.tests.transaction.CallCountingTransactionManager">
 		<property name="transactionSynchronizationName" value="SYNCHRONIZATION_NEVER"/>
 		<qualifier value="noSynch"/>
diff --git a/spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml b/spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
index 7b576f80f6..defff1ea26 100644
--- a/spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
+++ b/spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
@@ -68,7 +68,7 @@
 	<bean id="proxyFactory2Lazy" parent="baseProxyFactory">
 		<property name="target">
 			<bean class="org.springframework.aop.target.LazyInitTargetSource">
-				<property name="targetBeanName"><idref local="target"/></property>		
+				<property name="targetBeanName"><idref local="target"/></property>	
 			</bean>
 		</property>
 	</bean>
diff --git a/spring-tx/src/test/resources/org/springframework/transaction/txNamespaceHandlerTests.xml b/spring-tx/src/test/resources/org/springframework/transaction/txNamespaceHandlerTests.xml
index a8adf10c6d..723b5178b4 100644
--- a/spring-tx/src/test/resources/org/springframework/transaction/txNamespaceHandlerTests.xml
+++ b/spring-tx/src/test/resources/org/springframework/transaction/txNamespaceHandlerTests.xml
@@ -15,10 +15,10 @@
 		<tx:attributes>
 			<tx:method name="get*" read-only="true"/>
 			<tx:method name="set*"/>
-			<tx:method name="exceptional"/> 
+			<tx:method name="exceptional"/>
 		</tx:attributes>
 	</tx:advice>
-	
+
 	<tx:advice id="txRollbackAdvice">
 		<tx:attributes>
 			<tx:method name="get*" rollback-for="java.lang.Exception"/>
diff --git a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml
index 0ae01091c4..dbfec50abc 100644
--- a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml
+++ b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml
@@ -6,7 +6,7 @@
 	<bean id="portletMultipartResolver" class="org.springframework.web.portlet.multipart.CommonsPortletMultipartResolver"/>
 
 	<bean id="portletContextAwareBean" class="org.springframework.web.portlet.context.PortletContextAwareBean"/>
-	
+
 	<bean id="portletConfigAwareBean" class="org.springframework.web.portlet.context.PortletConfigAwareBean"/>
 
 </beans>
diff --git a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml
index f8d44ee12b..b11c4b291a 100644
--- a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml
+++ b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml
@@ -4,9 +4,9 @@
 <beans>
 
 	<import resource="classpath:/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml"/>
-	
+
 	<bean id="portletContextAwareBean" class="org.springframework.web.portlet.context.PortletContextAwareBean"/>
-	
+
 	<bean id="portletConfigAwareBean" class="org.springframework.web.portlet.context.PortletConfigAwareBean"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
index 85885f238d..1169e1f06f 100644
--- a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
+++ b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
@@ -6,7 +6,7 @@
 	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org/springframework/web/context/WEB-INF/test-messages</value></property>
 	</bean>
-	
+
 	<bean id="themeSource" class="org.springframework.ui.context.support.ResourceBundleThemeSource">
 		<property name="basenamePrefix"><value>org/springframework/web/context/WEB-INF/test-</value></property>
 	</bean>
@@ -48,7 +48,7 @@
 	<bean id="prototypeFactory" class="org.springframework.tests.sample.beans.factory.DummyFactory">
 		<property name="singleton"><value>false</value></property>
 	</bean>
-	
+
 	<bean id="listenerVeto" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>listenerVeto</value></property>
 		<property name="age"><value>66</value></property>
diff --git a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/parameterMapping.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/parameterMapping.xml
index f3fddf0d76..8873f1101b 100644
--- a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/parameterMapping.xml
+++ b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/parameterMapping.xml
@@ -11,9 +11,9 @@
 	 		</map>
 	 	</property>
 	</bean>
-	
+
 	<bean id="addItemHandler" class="java.lang.Object"/>
 
 	<bean id="removeItemHandler" class="java.lang.Object"/>
-	
+
 </beans>
diff --git a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeMapping.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeMapping.xml
index fc62e717e8..2ca24dbd71 100644
--- a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeMapping.xml
+++ b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeMapping.xml
@@ -12,11 +12,11 @@
 			</map>
 		</property>
 	</bean>
-	
+
 	<bean id="viewHandler" class="java.lang.Object"/>
 
 	<bean id="editHandler" class="java.lang.Object"/>
-	
+
 	<bean id="helpHandler" class="java.lang.Object"/>
-	
+
 </beans>
diff --git a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeParameterMapping.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeParameterMapping.xml
index 066d1a88c2..b417b0daa4 100644
--- a/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeParameterMapping.xml
+++ b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeParameterMapping.xml
@@ -20,11 +20,11 @@
 	 		</map>
 	 	</property>
 	</bean>
-	
+
 	<bean id="addItemHandler" class="java.lang.Object"/>
 
 	<bean id="removeItemHandler" class="java.lang.Object"/>
-	
+
 	<bean id="preferencesHandler" class="java.lang.Object"/>
-	
+
 </beans>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml
index f213aa1996..e5b6c7034f 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml
@@ -38,7 +38,7 @@
 		class="org.springframework.tests.sample.beans.factory.DummyFactory">
 		<property name="singleton"><value>false</value></property>
 	</bean>
-	
+
 	<bean id="listenerVeto" class="org.springframework.tests.sample.beans.TestBean">
 		<!--	<listener property="age" beanRef="agistListener" /> -->
 		<property name="name"><value>listenerVeto</value></property>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
index b49584e11d..fdb942812f 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
@@ -6,7 +6,7 @@
 	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
 
 	<bean id="servletContextAwareBean" class="org.springframework.web.context.ServletContextAwareBean"/>
-	
+
 	<bean id="servletConfigAwareBean" class="org.springframework.web.context.ServletConfigAwareBean"/>
 
 </beans>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml
index 85885f238d..1169e1f06f 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml
@@ -6,7 +6,7 @@
 	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org/springframework/web/context/WEB-INF/test-messages</value></property>
 	</bean>
-	
+
 	<bean id="themeSource" class="org.springframework.ui.context.support.ResourceBundleThemeSource">
 		<property name="basenamePrefix"><value>org/springframework/web/context/WEB-INF/test-</value></property>
 	</bean>
@@ -48,7 +48,7 @@
 	<bean id="prototypeFactory" class="org.springframework.tests.sample.beans.factory.DummyFactory">
 		<property name="singleton"><value>false</value></property>
 	</bean>
-	
+
 	<bean id="listenerVeto" class="org.springframework.tests.sample.beans.TestBean">
 		<property name="name"><value>listenerVeto</value></property>
 		<property name="age"><value>66</value></property>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/web.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/web.xml
index 1d412973be..fe01f6ce28 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/web.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/web.xml
@@ -4,9 +4,9 @@
 <web-app>
 	<display-name>ticket-webapp</display-name>
 	<description>Web interface for ticket application</description>
-	
+
 	<distributable/>
-	
+
 	<!--
 	<listener>
 		<listener-class>com.wrox.j2eedd.ticket.web.SessionCleanupListener</listener-class>
@@ -22,35 +22,35 @@
 		<servlet-class>org.springframework.framework.web.context.ContextLoaderServlet</servlet-class>
 		<init-param>
 			<param-name>contextClass</param-name>
-			<param-value>org.springframework.framework.web.context.XMLWebApplicationContext</param-value>   		
-		</init-param>	
+			<param-value>org.springframework.framework.web.context.XMLWebApplicationContext</param-value>   	
+		</init-param>
 		<init-param>
 			<param-name>log4jPropertiesUrl</param-name>
-			<param-value>/WEB-INF/log4j_PRODUCTION.properties</param-value>   		
-		</init-param>	
+			<param-value>/WEB-INF/log4j_PRODUCTION.properties</param-value>   	
+		</init-param>
 		<!-- This is essential -->
 		<load-on-startup>1</load-on-startup>
 	  </servlet>
-  
-  
+ 
+ 
   <servlet>
       	<servlet-name>boxOffice</servlet-name>
-      	<servlet-class>org.springframework.framework.web.workflow.CommandServlet</servlet-class>	
-  </servlet>  
-  
-  
-  
-  
+      	<servlet-class>org.springframework.framework.web.workflow.CommandServlet</servlet-class>
+  </servlet> 
+ 
+ 
+ 
+ 
   <servlet-mapping>
         	<servlet-name>boxOffice</servlet-name>
         	<url-pattern>/*.html</url-pattern>
   </servlet-mapping>
-  
+ 
   <servlet-mapping>
           	<servlet-name>config</servlet-name>
           	<url-pattern>/context/context.html</url-pattern>
   </servlet-mapping>
-  
+ 
 
 <session-config>
 <session-timeout>60</session-timeout>
@@ -65,27 +65,27 @@
      <error-code>403</error-code>
      <location>/jsp/layout/twocolumn/403-Forbidden.jsp</location>
   </error-page>
-  
+ 
     <error-page>
        <error-code>404</error-code>
        <location>/jsp/layout/twocolumn/404-NotFound.jsp</location>
   </error-page>
-  
+ 
   <error-page>
          <exception-type>java.lang.Throwable</exception-type>
          <location>/jsp/layout/twocolumn/uncaughtException.jsp</location>
   </error-page>
-  
+ 
  <taglib>
  	      	<taglib-uri>/bind</taglib-uri>
  	      	<taglib-location>/WEB-INF/tlds/b11.tld</taglib-location>
    </taglib>
-   
+  
    <taglib>
    	      	<taglib-uri>/events</taglib-uri>
    	      	<taglib-location>/WEB-INF/tlds/event11.tld</taglib-location>
   </taglib>
-  
+ 
   <security-constraint>
   	<web-resource-collection>
   	<web-resource-name>SalesInfo
@@ -97,30 +97,30 @@
   	<auth-constraint>
   	<role-name>registeredUsers</role-name>
   	</auth-constraint>
-  	<user-data-constraint>  		
+  	<user-data-constraint>  	
   	<transport-guarantee>NONE</transport-guarantee>
   	</user-data-constraint>
 </security-constraint>
 
- 
+
  	<login-config>
  		<auth-method>FORM</auth-method>
- 		
+ 	
  		<!-- Used only for BASIC authentication: only included because ServletUnit needs it -->
  		<realm-name>ticket</realm-name>
- 		
+ 	
  		<form-login-config>
  			<form-login-page>login.jsp</form-login-page>
  			<form-error-page>loginError.jsp</form-error-page>
  		</form-login-config>
  	</login-config>
- 	
- 	
+ 
+ 
  	<security-role>
 		<role-name>registeredUsers</role-name>
 	</security-role>
 
-	
+
 
 
 <ejb-ref>
@@ -147,5 +147,5 @@
 	<remote>com.wrox.j2eedd.ticket.ejb.customer.CustomerManagerRemote</remote>
 	<ejb-link>CustomerManager</ejb-link>
 </ejb-ref>
-	
+
 </web-app>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/beans1.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/beans1.xml
index 1058161049..3fc565ba81 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/beans1.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/beans1.xml
@@ -12,5 +12,5 @@
     <property name="name"><value>bean2</value></property>
     <property name="objRef"><ref bean="beans1.bean2"/></property>
   </bean>
- 
+
 </beans>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml
index 54acf06c40..5dba4fb3c4 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml
@@ -44,4 +44,3 @@
 	<mvc:script-template-configurer engine-name="nashorn" render-function="render"/>
 
 </beans>
- 
\ No newline at end of file
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-custom-order.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-custom-order.xml
index 5138c6b29b..713d85a7a2 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-custom-order.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-custom-order.xml
@@ -11,4 +11,3 @@
 	</mvc:view-resolvers>
 
 </beans>
- 
\ No newline at end of file
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
index 8037b0cfed..222650f8ee 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
@@ -39,4 +39,3 @@
 	</mvc:script-template-configurer>
 
 </beans>
- 
\ No newline at end of file
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml
index 92adae2d15..e29fff1961 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml
@@ -37,4 +37,4 @@
 
 	<bean id="starController"	class="java.lang.Object"/>
 
-</beans>		
+</beans>	
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
index 08f51cffe8..6af7ed4a28 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
@@ -30,4 +30,4 @@
 
 	<bean id="starController"	class="java.lang.Object"/>
 
-</beans>		
+</beans>	
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml
index bd73342dc4..5fc554a185 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/annotation/class-mapping.xml
@@ -8,7 +8,7 @@
 	<bean id="welcome" class="org.springframework.web.servlet.mvc.annotation.WelcomeController"/>
 	<bean id="admin" class="org.springframework.web.servlet.mvc.annotation.AdminController"/>
 	<bean id="buy" class="org.springframework.web.servlet.mvc.annotation.BuyForm"/>
-	
+
 	<bean name="/myFile" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
 	<bean name="/myFile2" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml
index 214b8498b3..5e376470d6 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/class-mapping.xml
@@ -8,7 +8,7 @@
 	<bean id="welcome" class="org.springframework.web.servlet.mvc.mapping.WelcomeController"/>
 	<bean id="admin" class="org.springframework.web.servlet.mvc.mapping.AdminController"/>
 	<bean id="buy" class="org.springframework.web.servlet.mvc.mapping.BuyForm"/>
-	
+
 	<bean name="/myFile" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
 	<bean name="/myFile2" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml
index 67ec8eda81..5d9a3aedb2 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/mapping/name-mapping.xml
@@ -8,7 +8,7 @@
 	<bean id="welcome" class="org.springframework.web.servlet.mvc.mapping.WelcomeController"/>
 	<bean id="admin" class="org.springframework.web.servlet.mvc.mapping.AdminController"/>
 	<bean id="buy" class="org.springframework.web.servlet.mvc.mapping.BuyForm"/>
-	
+
 	<bean name="/myFile" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
 	<bean name="/myFile2" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
 
diff --git a/src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml b/src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
index 59ae0b8b44..c63d4ab1ea 100644
--- a/src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
+++ b/src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
@@ -4,7 +4,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation=
-		"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
+		"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
 	default-autowire="byType">