From 35dee6df1d22737946d0b1e83334464cb15efb17 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 12 Nov 2010 06:46:15 -0500
Subject: [PATCH] INT-1552 removed StringMessage references from the manual

---
 docs/src/reference/docbook/channel.xml |  2 +-
 docs/src/reference/docbook/message.xml | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs/src/reference/docbook/channel.xml b/docs/src/reference/docbook/channel.xml
index 1876792ff9..90b9bb8e8e 100644
--- a/docs/src/reference/docbook/channel.xml
+++ b/docs/src/reference/docbook/channel.xml
@@ -335,7 +335,7 @@
       and wait for a reply.
       <programlisting language="java">MessagingTemplate template = new MessagingTemplate();
 
-Message reply = template.sendAndReceive(new StringMessage("test"), someChannel);</programlisting>
+Message reply = template.sendAndReceive(new GenericMessage("test"), someChannel);</programlisting>
       In that example, a temporary anonymous channel would be created internally by the template. The
       'sendTimeout' and 'receiveTimeout' properties may also be set on the template, and other exchange
       types are also supported.
diff --git a/docs/src/reference/docbook/message.xml b/docs/src/reference/docbook/message.xml
index 2129313f02..7312dce3f1 100644
--- a/docs/src/reference/docbook/message.xml
+++ b/docs/src/reference/docbook/message.xml
@@ -130,16 +130,12 @@ new GenericMessage&lt;T&gt;(T payload, Map&lt;String, Object&gt; headers)</progr
       will copy the provided headers to the newly created Message.
     </para>
     <para>
-    There are also two convenient subclasses available: <classname>StringMessage</classname> and
-      <classname>ErrorMessage</classname>. The former accepts a String as its payload:
-      <programlisting language="java">StringMessage message = new StringMessage("hello world");
-
-String s = message.getPayload();</programlisting>
-      And, the latter accepts any <classname>Throwable</classname> object as its payload:
+    There is also a convenient implementation of <interfacename>Message</interfacename> designed to communicate 
+    error conditions. THis implementation takes <classname>Throwable</classname> object as its payload:
       <programlisting language="java">ErrorMessage message = new ErrorMessage(someThrowable);
 
 Throwable t = message.getPayload();</programlisting>
-      Notice that these implementations take advantage of the fact that the <classname>GenericMessage</classname>
+      Notice that this implementation takes advantage of the fact that the <classname>GenericMessage</classname>
       base class is parameterized. Therefore, as shown in both examples, no casting is necessary when retrieving
       the Message payload Object.
     </para>