Adds the 'timeout' attribute on <aggregator/> (INT-139)

spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java

@@ -99,6 +99,8 @@ public class AggregatorParserTests {
 		Assert.assertEquals(
 				"The AggregatingMessageHandler is not configured with the appropriate tracked correlationId capacity",
 				99, getPropertyValue(completeAggregatingMessageHandler, "trackedCorrelationIdCapacity", int.class));
+		Assert.assertEquals("The AggregatingMessageHandler is not configured with the appropriate timeout",
+				42l, getPropertyValue(completeAggregatingMessageHandler, "timeout", long.class));
 	}
 
 	@Test

spring-integration-core/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<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: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/integration
-			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<aggregator id="aggregatorWithReference" ref="aggregatorBean"/>
 
@@ -17,7 +17,8 @@
 				send-timeout="86420000"
 				send-partial-result-on-timeout="true"
 				reaper-interval="135"
-				tracked-correlation-id-capacity="99"/>
+				tracked-correlation-id-capacity="99"
+				timeout="42"/>
 				
 	<aggregator id="aggregatorWithReferenceAndMethod" ref="adderBean" method="add" default-reply-channel="replyChannel"/>
 
@@ -29,6 +30,6 @@
 	
 	<beans:bean id="adderBean" class="org.springframework.integration.config.Adder"/>
 
-	<beans:bean id="completionStrategy" class="org.springframework.integration.config.TestCompletionStrategy"/>
+	<beans:bean id="completionStrategy" class="org.springframework.integration.config.TestCompletionStrategy"/>
 
 </beans:beans>