From 8ae6d7b842b44401a7b459712b5ffa9c6bd0f3cb Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 18 Jul 2011 09:01:23 -0400
Subject: [PATCH] INT-1980 added schema and reference documentation related to
 the 'pub-sub-domain' attribute of JMS module

---
 docs/src/reference/docbook/jms.xml                     |  6 ++++++
 .../jms/config/spring-integration-jms-2.0.xsd          | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/src/reference/docbook/jms.xml b/docs/src/reference/docbook/jms.xml
index 24246bddfb..436f63efea 100644
--- a/docs/src/reference/docbook/jms.xml
+++ b/docs/src/reference/docbook/jms.xml
@@ -9,6 +9,12 @@
     an outbound Channel Adapter which uses the <classname>JmsTemplate</classname> to convert and send a JMS Message on
     demand.
   </para>
+  <para>
+  As you can see from above by using <classname>JmsTemplate</classname> and <classname>MessageListener</classname> container Spring Integration relies on Spring's JMS support.
+  This is important to understand since most of the attributes exposed on these adapters will configure the underlying Spring's <classname>JmsTemplate</classname> and/or 
+  <classname>MessageListener</classname> container. For more details about <classname>JmsTemplate</classname> and <classname>MessageListener</classname> container please refer to 
+  <ulink url="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/jms.html">Spring JMS documentation</ulink>.
+  </para>
   <para>
     Whereas the JMS Channel Adapters are intended for unidirectional Messaging (send-only or receive-only), Spring
     Integration also provides inbound and outbound JMS Gateways for request/reply operations. The inbound gateway
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 a96cf536e7..1dd9054225 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
@@ -368,7 +368,15 @@
 						</xsd:annotation>
 					</xsd:attribute>
 					<xsd:attribute name="destination-name" type="xsd:string"/>
-					<xsd:attribute name="pub-sub-domain" type="xsd:string"/>
+					<xsd:attribute name="pub-sub-domain" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation>
+	The boolean property used to configure the JmsTemplate with knowledge of what JMS domain is being used. By default the value of this property is 'false'', 
+	indicating that the point-to-point domain, Queues, will be used. This property used by JmsTemplate determines the behavior of dynamic destination resolution 
+	via implementations of the DestinationResolver interface.			
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
 					<xsd:attribute name="channel" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>