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

Removed the 'ws-' prefix from 'service-activator' now that it is qualified by its namespace.

Browse Source
This commit is contained in:
Mark Fisher
2008-09-19 22:28:47 +00:00
parent 6cc2c60173
commit 0d947ed872
5 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WsNamespaceHandler.java
View File

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
public class WsNamespaceHandler extends NamespaceHandlerSupport {
public void init() {
this.registerBeanDefinitionParser("ws-service-activator", new WebServiceHandlerParser());
this.registerBeanDefinitionParser("service-activator", new WebServiceHandlerParser());
}
}

2
org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
View File

@@ -16,7 +16,7 @@
]]></xsd:documentation>
</xsd:annotation>
<xsd:element name="ws-service-activator">
<xsd:element name="service-activator">
<xsd:complexType>
<xsd:annotation>
<xsd:documentation>

50
org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
View File

@@ -12,35 +12,35 @@
<si:channel id="inputChannel"/>
<ws:ws-service-activator id="handlerWithAllInOneMarshaller"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshallerAndUnmarshaller"/>
<ws:service-activator id="handlerWithAllInOneMarshaller"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshallerAndUnmarshaller"/>
<ws:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshaller"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshaller"
unmarshaller="unmarshaller"/>
<ws:service-activator id="handlerWithSeparateMarshallerAndUnmarshaller"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshaller"
unmarshaller="unmarshaller"/>
<ws:ws-service-activator id="handlerWithCustomRequestCallback"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshallerAndUnmarshaller"
request-callback="requestCallback"/>
<ws:service-activator id="handlerWithCustomRequestCallback"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshallerAndUnmarshaller"
request-callback="requestCallback"/>
<ws:ws-service-activator id="handlerWithAllInOneMarshallerAndMessageFactory"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshallerAndUnmarshaller"
message-factory="messageFactory"/>
<ws:service-activator id="handlerWithAllInOneMarshallerAndMessageFactory"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshallerAndUnmarshaller"
message-factory="messageFactory"/>
<ws:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshallerAndMessageFactory"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshaller"
unmarshaller="unmarshaller"
message-factory="messageFactory"/>
<ws:service-activator id="handlerWithSeparateMarshallerAndUnmarshallerAndMessageFactory"
input-channel="inputChannel"
uri="http://example.org"
marshaller="marshaller"
unmarshaller="unmarshaller"
message-factory="messageFactory"/>
<bean id="marshallerAndUnmarshaller" class="org.springframework.integration.ws.config.StubMarshallerAndUnmarshaller"/>

48
org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
View File

@@ -12,35 +12,35 @@
<si:channel id="inputChannel"/>
<ws:ws-service-activator id="handlerWithDefaultSourceExtractor"
input-channel="inputChannel"
uri="http://example.org"/>
<ws:service-activator id="handlerWithDefaultSourceExtractor"
input-channel="inputChannel"
uri="http://example.org"/>
<ws:ws-service-activator id="handlerWithCustomSourceExtractor"
input-channel="inputChannel"
uri="http://example.org"
source-extractor="sourceExtractor"/>
<ws:service-activator id="handlerWithCustomSourceExtractor"
input-channel="inputChannel"
uri="http://example.org"
source-extractor="sourceExtractor"/>
<ws:ws-service-activator id="handlerWithCustomRequestCallback"
input-channel="inputChannel"
uri="http://example.org"
request-callback="requestCallback"/>
<ws:service-activator id="handlerWithCustomRequestCallback"
input-channel="inputChannel"
uri="http://example.org"
request-callback="requestCallback"/>
<ws:ws-service-activator id="handlerWithCustomMessageFactory"
input-channel="inputChannel"
uri="http://example.org"
message-factory="messageFactory"/>
<ws:service-activator id="handlerWithCustomMessageFactory"
input-channel="inputChannel"
uri="http://example.org"
message-factory="messageFactory"/>
<ws:ws-service-activator id="handlerWithCustomSourceExtractorAndMessageFactory"
input-channel="inputChannel"
uri="http://example.org"
source-extractor="sourceExtractor"
message-factory="messageFactory"/>
<ws:service-activator id="handlerWithCustomSourceExtractorAndMessageFactory"
input-channel="inputChannel"
uri="http://example.org"
source-extractor="sourceExtractor"
message-factory="messageFactory"/>
<ws:ws-service-activator id="handlerWithCustomFaultMessageResolver"
input-channel="inputChannel"
uri="http://example.org"
fault-message-resolver="faultMessageResolver"/>
<ws:service-activator id="handlerWithCustomFaultMessageResolver"
input-channel="inputChannel"
uri="http://example.org"
fault-message-resolver="faultMessageResolver"/>
<bean id="sourceExtractor" class="org.springframework.integration.ws.config.StubSourceExtractor"/>