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

INT-1552 Add error-channel to other endpoint docs; schema doc polishing

Browse Source
This commit is contained in:
Gary Russell
2010-11-18 18:21:14 -05:00
parent 2df5efb309
commit c5dba36865
6 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/src/reference/docbook/event.xml
View File

@@ -26,11 +26,15 @@
<para>
For convenience namespace support is provided to configure an <classname>ApplicationEventListeningMessageProducer</classname>
via the <emphasis>inbound-channel-adapter</emphasis> element.
<programlisting language="xml"><![CDATA[<int-event:inbound-channel-adapter channel="eventChannel" event-types="example.FooEvent, example.BarEvent"/>
<programlisting language="xml"><![CDATA[<int-event:inbound-channel-adapter channel="eventChannel"
error-channel="eventErrorChannel"
event-types="example.FooEvent, example.BarEvent"/>
<int:publish-subscribe-channel id="eventChannel"/>]]></programlisting>
In the above example, all Application Context events that match one of the types specified by the 'event-types' (optional) attribute will be
delivered as Spring Integration Messages to the Message Channel named 'eventChannel'.
delivered as Spring Integration Messages to the Message Channel named 'eventChannel'. If a downstream component throws
an exception, a MessagingException containing the failed message and exception will be sent to the channel named
'eventErrorChannel'. If no "error-channel" is specified, the exception will be propagated to the caller.
</para>
</section>

6
docs/src/reference/docbook/mail.xml
View File

@@ -156,6 +156,12 @@
reply-to="replyTo@example.org"
overwrite="false"/>]]></programlisting>
</para>
<para>
Finally, the &lt;imap-idle-channel-adapter/&gt; also accepts the 'error-channel' attribute.
If a synchronous downstream exception is thrown and an 'error-channel' is specified,
the MessagingException containing the failed message and exception, will be sent to this channel.
Otherwise, any such exception will simply be logged as a warning by the channel adapter.
</para>
</section>
</chapter>

4
spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd
View File

@@ -48,8 +48,8 @@
</xsd:appinfo>
<xsd:documentation>
If a (synchronous) downstream exception is thrown and an error-channel is specified,
the MessageHandlingException will be sent to this channel. Otherwise, any such exception
will be propagated to the calling thread.
the MessagingException will be sent to this channel. Otherwise, any such exception
will be propagated to the caller.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>

6
spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
View File

@@ -57,7 +57,7 @@ its configuration specifies the number of threads.
</xsd:appinfo>
<xsd:documentation>
If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
the MessageHandlingException will be sent to this channel. Otherwise, any such exception
the MessagingException will be sent to this channel. Otherwise, any such exception
will simply be logged by the channel adapter.
</xsd:documentation>
</xsd:annotation>
@@ -133,7 +133,7 @@ adapter.
</xsd:appinfo>
<xsd:documentation>
If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
the MessageHandlingException will be sent to this channel. Otherwise, any such exception
the MessagingException will be sent to this channel. Otherwise, any such exception
will simply be logged by the channel adapter.
</xsd:documentation>
</xsd:annotation>
@@ -214,7 +214,7 @@ A connection factory is needed by an inbound adapter. The connection factory mus
</xsd:appinfo>
<xsd:documentation>
If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
the MessageHandlingException will be sent to this channel and the ultimate response
the MessagingException will be sent to this channel and the ultimate response
of the error flow will be returned as a response by the gateway. If no
"error-channel" is specified, any such exception
will simply be logged by the gateway. In such a situation, no response is sent

4
spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
View File

@@ -398,7 +398,7 @@
</xsd:appinfo>
<xsd:documentation>
If a (synchronous) downstream exception is thrown and an error-channel is specified,
the MessageHandlingException will be sent to this channel. Otherwise, any such exception
the MessagingException will be sent to this channel. Otherwise, any such exception
will be propagated to the listener container and any JMS transaction will be
rolled back. Any synchronous downstream exceptions in the error flow will
also cause any JMS transaction to be rolled back.
@@ -559,7 +559,7 @@
</xsd:appinfo>
<xsd:documentation>
If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
the MessageHandlingException will be sent to this channel; any response from
the MessagingException will be sent to this channel; any response from
which will be returned as a reply by the gateway. If an "error-channel" is not
supplied, any such exception
will be propagated to the listener container and any JMS transaction will be

2
spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
View File

@@ -118,7 +118,7 @@
</xsd:appinfo>
<xsd:documentation>
If a (synchronous) downstream exception is thrown and an error-channel is specified,
the MessageHandlingException will be sent to this channel. Otherwise, any such exception
the MessagingException will be sent to this channel. Otherwise, any such exception
will simply be logged as a warning by the channel adapter.
</xsd:documentation>
</xsd:annotation>