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

INT-2316: xsd improve for reply- & error-channels

Browse Source 
Now <header-enricher> <reply-channel> & <error-channel> are 'referenceOrValueHeaderType'.
Added tests for 'value' & 'expression' attributes on <reply-channel> element.
This commit is contained in:
Artem Bilan
2011-12-20 16:21:14 +02:00
committed by Mark Fisher
parent ba9041d641
commit d7851fef5a
3 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd
View File

@@ -1603,17 +1603,21 @@ endpoint itself is a Polling Consumer for a channel with a queue.
<xsd:complexType name="header-enricher-type">
<xsd:choice minOccurs="1" maxOccurs="unbounded">
<xsd:element name="reply-channel" type="referenceHeaderType">
<xsd:element name="reply-channel" type="referenceOrValueHeaderType">
<xsd:annotation>
<xsd:documentation>
Shortcut to specify value for 'replyChannel' header
Shortcut to specify value for 'replyChannel' header.
Can be a 'ref' to the MessageChannel, a 'value' as name of the MessageChannel,
or some valid SpEL 'expression' which returns the MessageChannel reference or name of the MessageChannel.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="error-channel" type="referenceHeaderType">
<xsd:element name="error-channel" type="referenceOrValueHeaderType">
<xsd:annotation>
<xsd:documentation>
Shortcut to specify value for 'errorChannel' header
Shortcut to specify value for 'errorChannel' header.
Can be a 'ref' to the MessageChannel, a 'value' as name of the MessageChannel,
or some valid SpEL 'expression' which returns the MessageChannel reference or name of the MessageChannel.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1795,7 +1799,7 @@ endpoint itself is a Polling Consumer for a channel with a queue.
<xsd:attribute name="expression" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Expression to be evaulated at runtime to determine the header value.
Expression to be evaluated at runtime to determine the header value.
The EvaluationContext will
include variables for 'payload' and
'headers'.