Removed support for <handler-endpoint/> (replaced by <service-activator/>).

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

@@ -12,7 +12,7 @@
 	<channel id="inputChannel"/>
 	<channel id="outputChannel"/>
 
-	<handler-endpoint input-channel="inputChannel" ref="simpleHandler" output-channel="outputChannel"/>
+	<service-activator input-channel="inputChannel" ref="simpleHandler" output-channel="outputChannel"/>
 
 	<beans:bean class="org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor">
 		<beans:constructor-arg ref="internal.MessageBus"/>

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

@@ -11,7 +11,7 @@
 
 	<channel id="testChannel"/>
 
-	<handler-endpoint id="endpoint" input-channel="testChannel" handler="testHandler" error-handler="errorHandler"/>
+	<service-activator id="endpoint" input-channel="testChannel" ref="testHandler" error-handler="errorHandler"/>
 
 	<beans:bean id="testHandler" class="org.springframework.integration.config.ExceptionThrowingTestHandler"/>
 

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

@@ -19,9 +19,9 @@
 		<handler ref="handler3"/>
 	</handler-chain>
 
-	<handler-endpoint input-channel="testChannel" ref="chain" output-channel="replyChannel">
+	<service-activator input-channel="testChannel" ref="chain" output-channel="replyChannel">
 		<schedule period="100"/>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="handler1" class="org.springframework.integration.config.TestConcatenatingHandler">
 		<beans:constructor-arg value="-1"/>

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

@@ -11,10 +11,10 @@
 
 	<queue-channel id="testChannel" capacity="50"/>
 
-	<handler-endpoint id="endpoint" input-channel="testChannel"
+	<service-activator id="endpoint" input-channel="testChannel"
 	                  ref="testHandler" selector="typeSelector">
 		<schedule period="100"/>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="typeSelector" class="org.springframework.integration.message.selector.PayloadTypeSelector">
 		<beans:constructor-arg value="java.lang.String"/>

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

@@ -11,9 +11,9 @@
 
 	<queue-channel id="testChannel" capacity="50"/>
 
-	<handler-endpoint input-channel="testChannel" ref="testBean" method="store">
+	<service-activator input-channel="testChannel" ref="testBean" method="store">
 		<schedule period="100"/>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="testBean" class="org.springframework.integration.config.TestBean">
 		<beans:constructor-arg value="1"/>

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

@@ -11,9 +11,9 @@
 
 	<queue-channel id="testChannel" capacity="50"/>
 
-	<handler-endpoint input-channel="testChannel" ref="testHandler">
+	<service-activator input-channel="testChannel" ref="testHandler">
 		<schedule period="100"/>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="testHandler" class="org.springframework.integration.config.TestHandler">
 		<beans:constructor-arg value="1"/>

org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorPropagationTests.xml

@@ -12,7 +12,7 @@
 	<channel id="input"/>
 	<channel id="output"/>
 
-	<handler-endpoint id="required"
+	<service-activator id="required"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -21,9 +21,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="REQUIRED"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint id="requiresNew"
+	<service-activator id="requiresNew"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -32,9 +32,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="REQUIRES_NEW"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint id="supports"
+	<service-activator id="supports"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -43,9 +43,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="SUPPORTS"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint id="notSupported"
+	<service-activator id="notSupported"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -54,9 +54,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="NOT_SUPPORTED"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint id="mandatory"
+	<service-activator id="mandatory"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -65,7 +65,7 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="MANDATORY"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
 	<beans:bean id="testBean" class="org.springframework.integration.endpoint.interceptor.TestBean"/>
 

org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorTests.xml

@@ -13,7 +13,7 @@
 	<channel id="goodInput"/>
 	<channel id="output"/>
 
-	<handler-endpoint input-channel="badInput"
+	<service-activator input-channel="badInput"
 	                  ref="testBean"
 	                  method="bad"
                       output-channel="output">
@@ -21,9 +21,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint input-channel="goodInput"
+	<service-activator input-channel="goodInput"
 	                  ref="testBean"
 	                  method="good"
                       output-channel="output">
@@ -31,7 +31,7 @@
 		<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="REQUIRED"/>
 		</interceptors>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="testBean" class="org.springframework.integration.endpoint.interceptor.TestBean"/>
 

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

@@ -11,7 +11,7 @@
 
 	<channel id="requestChannel"/>
 
-	<handler-endpoint ref="handler" input-channel="requestChannel"/>
+	<service-activator ref="handler" input-channel="requestChannel"/>
 
 	<beans:bean id="proxy" class="org.springframework.integration.gateway.GatewayProxyFactoryBean">
 		<beans:property name="serviceInterface" value="org.springframework.integration.gateway.TestService"/>

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

@@ -15,7 +15,7 @@
 		<interceptor ref="interceptor"/>
 	</channel>
 
-	<handler-endpoint ref="handler" input-channel="requestChannel"/>
+	<service-activator ref="handler" input-channel="requestChannel"/>
 
 	<beans:bean id="proxy" class="org.springframework.integration.gateway.GatewayProxyFactoryBean">
 		<beans:property name="serviceInterface" value="org.springframework.integration.gateway.TestService"/>