removed explicit versions from XSD declarations

org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config />
 

org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config />
 

org.springframework.integration/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"
 	xmlns:util="http://www.springframework.org/schema/util">
 
 	<channel id="noLoadBalancerNoFailover" >

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="customQueueChannel">
 		<queue ref="queue" />
@@ -13,7 +13,5 @@
 	<beans:bean id="queue" class="java.util.concurrent.ArrayBlockingQueue">
 		<beans:constructor-arg value="2" />
 	</beans:bean>
-	
-	
 
 </beans:beans>

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="dispatcherAttribute" dispatcher="failover"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<thread-local-channel id="simpleChannel"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channelWithInterceptorRef">
 		<queue capacity="5"/>

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="capacityChannel">
 		<queue capacity="10" />

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:channel/>
 

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/dispatcherAttributeAndSubElement.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="dispatcherAttributeAndSubElement" dispatcher="failover">
 		<dispatcher/>

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="priorityChannelWithDefaultComparator">
 		<priority-queue capacity="10"/>

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel">
 		<rendezvous-queue/>

org.springframework.integration/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests-context.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
     <beans:bean id="correlationStrategy" class="org.springframework.integration.config.AggregatorWithCorrelationStrategyTests$FirstLetterCorrelationStrategy"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="pollableInput">
 		<queue />

org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml

@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration.xsd">
 

org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="adapterOutput">
 		<queue capacity="1"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<si:channel id="input"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<selector-chain id="selectorChain">
 		<selector ref="selector1"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="outputChannel">
 		<queue capacity="5"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests-context.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config />
 

org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:annotation-config/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:annotation-config/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml

@@ -3,11 +3,11 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/context
-			http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+			http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<annotation-config/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:annotation-config/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 				
 	<aggregator id="aggregator" ref="adderBean" method="add" completion-strategy="testCompletionStrategy"
 		input-channel="input-channel" output-channel="replyChannel">

org.springframework.integration/src/test/java/org/springframework/integration/config/correlationStrategyWithVoidMethods.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
     <beans:bean id="correlationStrategy" class="org.springframework.integration.config.CorrelationStrategyInvalidConfigurationTests$VoidReturningCorrelationStrategy"/>
 
@@ -20,12 +20,10 @@
         <queue capacity="10"/>
     </channel>
 
-
     <aggregator ref="aggregator"
                 completion-strategy="completionStrategy"
                 correlation-strategy="correlationStrategy" completion-strategy-method="invalidCorrelationMethod"
                 input-channel="inputChannel"
                 output-channel="outputChannel"/>
     
-
 </beans:beans>

org.springframework.integration/src/test/java/org/springframework/integration/config/invalidCompletionStrategyMethod.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<aggregator id="aggregatorWithPojoCompletionStrategy"
 		completion-strategy="completionStrategy"

org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 			
 	<channel id="inputChannel"/>
 	<channel id="replyChannel"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<application-event-multicaster/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="test"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="errorChannel"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="test"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="test"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<publish-subscribe-channel id="defaultChannel"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="inputChannel"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="testChannel">
 		<queue capacity="50"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="wireTapChannel">
 		<queue capacity="1"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<!-- pollable to subscribable -->
 	<channel id="pollableChannel">

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest-context.xml

@@ -3,9 +3,12 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:b="http://www.springframework.org/schema/beans"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-    		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+    		http://www.springframework.org/schema/integration
+    		http://www.springframework.org/schema/integration/spring-integration.xsd
+    		http://www.springframework.org/schema/context
+    		http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<context:annotation-config />
 

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-child.xml

@@ -2,8 +2,10 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="output">
 		<queue/>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-parent.xml

@@ -2,8 +2,10 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<!-- triggers bootstrapping of the post-processor -->
 	<channel id="test"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerParserTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="inputA"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests-context.xml

@@ -2,10 +2,13 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"
-	xmlns:util="http://www.springframework.org/schema/util">
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/util
+			http://www.springframework.org/schema/util/spring-util.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<util:properties id="testConfigurations" location="classpath:org/springframework/integration/config/xml/innerdefaware.properties"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel"/>
 	
@@ -23,5 +24,7 @@
             <interval-trigger interval="20" /> 
         </poller> 
 	</outbound-channel-adapter>
+
 	<thread-pool-task-executor id="executor" core-size="5" /> 
+
 </beans:beans>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests-context.xml

@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<selector-chain id="selector">
 		<selector ref="someBean" method="accept" />
 	</selector-chain>
+
 	<beans:bean id="someBean"
 		class="org.springframework.integration.config.xml.MethodInvokingSelectorParserTests$SomeClass" />
+
 </beans:beans>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="directInput"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="directInput"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests-context.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="directInput"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="defaultPollerWithId" default="true">
 		<interval-trigger interval="5000"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller default="true">
 		<interval-trigger interval="5000"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="requestChannel">
 		<queue capacity="100"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties

@@ -3,9 +3,9 @@ splitter-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="2" /> \
@@ -19,9 +19,9 @@ splitter-inner-success-with-poller=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 		<queue capacity="2" /> \
 	</channel> \
@@ -41,9 +41,9 @@ splitter-inner-success-with-poller-reversed-order=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 		<queue capacity="2" /> \
 	</channel> \
@@ -63,9 +63,9 @@ splitter-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="2" /> \
@@ -78,9 +78,9 @@ splitter-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="2" /> \
@@ -95,9 +95,9 @@ transformer-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -111,9 +111,9 @@ transformer-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -126,9 +126,9 @@ transformer-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -143,9 +143,9 @@ router-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="channel1"> \
 		<queue capacity="1" /> \
@@ -162,9 +162,9 @@ router-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="channel1"> \
 		<queue capacity="1" /> \
@@ -180,9 +180,9 @@ router-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<router id="testRouter" ref="testRouterBean" input-channel="inChannel" method="route"> \
 		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestRouter" /> \
@@ -194,9 +194,9 @@ sa-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -210,9 +210,9 @@ sa-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -225,9 +225,9 @@ sa-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -242,9 +242,9 @@ aggregator-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="5" /> \
@@ -258,9 +258,9 @@ aggregator-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 	</channel> \
 	<channel id="outChannel"> \
@@ -274,9 +274,9 @@ aggregator-inner-concurrent-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 		<queue capacity="5" /> \
 	</channel> \
@@ -296,9 +296,9 @@ aggregator-inner-concurrent-success-reorder-bean-poller=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 		<queue capacity="5" /> \
 	</channel> \
@@ -318,9 +318,9 @@ aggregator-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="5" /> \
@@ -335,9 +335,9 @@ filter-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -351,9 +351,9 @@ filter-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1"/> \
@@ -366,9 +366,9 @@ filter-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1"/> \

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="defaultPoller1" default="true">
 		<interval-trigger interval="3000"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="poller">
 		<interval-trigger interval="5000"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="poller" receive-timeout="1234">
 		<interval-trigger interval="5" time-unit="SECONDS"/>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/propertyplaceholder/PropertyPlaceholderTests-context.xml

@@ -5,13 +5,13 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	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-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/context
-			http://www.springframework.org/schema/context/spring-context-2.5.xsd
+			http://www.springframework.org/schema/context/spring-context.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<channel id="something">
 		<queue capacity="${capacity}" />
@@ -21,6 +21,8 @@
 		class="org.springframework.integration.config.xml.propertyplaceholder.PropertyPlaceholderTests$SanityCheck">
 		<beans:constructor-arg value="${capacity}" />
 	</beans:bean>
+
 	<context:property-placeholder
 		location="org/springframework/integration/config/xml/propertyplaceholder/channel.properties" />
+
 </beans:beans>

org.springframework.integration/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller>
 		<interval-trigger interval="3000"/>

org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>

org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>

org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>

org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>

org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>

org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="badInput">
 		<queue capacity="1"/>

org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<si:channel id="errorChannel">
 		<si:queue capacity="10"/>

org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<si:poller id="poller" default="true">
 		<si:interval-trigger interval="50"/>

org.springframework.integration/src/test/java/org/springframework/integration/filter/filterContextTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="requestChannel"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="requestChannel"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests-context.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel1">
 		<queue capacity="1" />
@@ -29,6 +30,5 @@
 	<gateway id="testServiceB"
 		service-interface="org.springframework.integration.router.config.HeaderValueRouterParserTests$TestServiceB"
 		default-request-channel="routingChannelB" />
-		
 	
 </beans:beans>

org.springframework.integration/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests-context.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel1">
 		<queue capacity="1" />
@@ -22,4 +23,5 @@
 	<gateway id="testService"
 		service-interface="org.springframework.integration.router.config.PayloadTypeRouterParserTests$TestService"
 		default-request-channel="routingChannel" />
+
 </beans:beans>

org.springframework.integration/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests-context.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel1">
 		<queue capacity="1" />

org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="numbers"/>
 	<channel id="splits"/>

org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="output">
 		<queue capacity="10"/>

org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration
-		http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+		http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 

org.springframework.integration/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>