Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Fisher
2008-07-19 03:23:23 +00:00
parent fcc5d56f81
commit 71dd2f2e80
14 changed files with 27 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultHandlerEndpointParser.java
View File

@@ -1,32 +0,0 @@
/*
* Copyright 2002-2008 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.config;
import org.springframework.integration.handler.DefaultMessageHandlerAdapter;
import org.springframework.integration.handler.MessageHandler;
/**
* @author Mark Fisher
*/
public class DefaultHandlerEndpointParser extends AbstractHandlerEndpointParser {
@Override
protected Class<? extends MessageHandler> getHandlerAdapterClass() {
return DefaultMessageHandlerAdapter.class;
}
}

1
org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
View File

@@ -61,7 +61,6 @@ public class IntegrationNamespaceHandler extends NamespaceHandlerSupport {
registerBeanDefinitionParser("priority-channel", new PriorityChannelParser());
registerBeanDefinitionParser("rendezvous-channel", new RendezvousChannelParser());
registerBeanDefinitionParser("thread-local-channel", new ThreadLocalChannelParser());
registerBeanDefinitionParser("handler-endpoint", new DefaultHandlerEndpointParser());
registerBeanDefinitionParser("service-activator", new ServiceActivatorParser());
registerBeanDefinitionParser("channel-adapter", new ChannelAdapterParser());
registerBeanDefinitionParser("gateway", new GatewayParser());

8
org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
View File

@@ -203,14 +203,6 @@
</xsd:annotation>
</xsd:element>
<xsd:element name="handler-endpoint" type="inputOutputHandlerEndpointType">
<xsd:annotation>
<xsd:documentation>
Defines an endpoint for a MessageHandler.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="inputOutputHandlerEndpointType">
<xsd:annotation>
<xsd:documentation>

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

@@ -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"/>

2
org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
View File

@@ -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"/>

4
org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml
View File

@@ -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"/>

4
org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
View File

@@ -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"/>

4
org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
View File

@@ -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"/>

4
org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
View File

@@ -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"/>

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

@@ -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"/>

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

@@ -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"/>

2
org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
View File

@@ -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"/>

2
org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
View File

@@ -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"/>