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

Merge pull request #48 from markfisher/INT-1943

Browse Source 
properly applying JMS outbound-gateway send-timeout and receive-timeout attributes
  clarified role of send-timeout and receive-timeout in the XSD documentation
This commit is contained in:
Mark Fisher
2011-08-30 22:33:03 -04:00
parent fe3f1f3802 9dd7053112
commit fb12e94714
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java
View File

@@ -74,6 +74,7 @@ public class JmsOutboundGatewayParser extends AbstractConsumerEndpointParser {
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-request-payload");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-reply-payload");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "receive-timeout");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "request-pub-sub-domain");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "reply-pub-sub-domain");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "time-to-live");

17
spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd
View File

@@ -725,8 +725,20 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="request-timeout" type="xsd:string"/>
<xsd:attribute name="reply-timeout" type="xsd:string"/>
<xsd:attribute name="receive-timeout" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Timeout for the JMS MessageConsumer to receive the JMS reply Message. Default is 5 seconds.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="send-timeout" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Timeout for sending the mapped integration Message to this gateway's reply-channel. Default is indefinite.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="request-destination" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
@@ -847,7 +859,6 @@
</xsd:attribute>
<xsd:attribute name="extract-request-payload" type="xsd:string" default="true"/>
<xsd:attribute name="extract-reply-payload" type="xsd:string" default="true"/>
<xsd:attribute name="receive-timeout" type="xsd:string"/>
<xsd:attribute name="delivery-mode" type="xsd:string">
<xsd:annotation>
<xsd:documentation><![CDATA[