From cf5f51fdb5d9b5545b3bb5305d59ae51187a7256 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Wed, 17 Nov 2010 16:49:13 -0500
Subject: [PATCH] INT-1624 Polish ip and jms schemas for error-channel

---
 .../ip/config/spring-integration-ip-2.0.xsd    | 18 ++++++++++++++++++
 .../jms/config/spring-integration-jms-2.0.xsd  | 16 ++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
index bef826260f..fa51d36b92 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
@@ -55,6 +55,11 @@ its configuration specifies the number of threads.
 									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
 								</tool:annotation>
 							</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 simply be logged by the channel adapter.
+							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
 				</xsd:extension>
@@ -126,6 +131,11 @@ adapter.
 							<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
 						</tool:annotation>
 					</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 simply be logged by the channel adapter.
+					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 		</xsd:complexType>
@@ -202,6 +212,14 @@ A connection factory is needed by an inbound adapter. The connection factory mus
 							<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
 						</tool:annotation>
 					</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
+						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
+						to the client. 
+					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 		</xsd:complexType>
diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
index 2979cb4711..2c55e6687c 100644
--- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
+++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
@@ -396,6 +396,13 @@
 									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
 								</tool:annotation>
 							</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 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.
+							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
 					<xsd:attribute name="transaction-manager" type="xsd:string">
@@ -550,6 +557,15 @@
 									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
 								</tool:annotation>
 							</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
+								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
+								rolled back. Any synchronous downstream exceptions in the error flow will
+								also cause any JMS transaction to be rolled back.
+							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
 					<xsd:attribute name="transaction-manager" type="xsd:string">