From 7c87c70d8ee9842dcedf324d856948d9107dc087 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 22 Nov 2010 15:13:30 -0500
Subject: [PATCH] INT-1552 fixed more text overflow in HTTP module, added
 DEPRECATED note to HttpInvoker module

---
 docs/src/reference/docbook/http.xml        | 6 +++---
 docs/src/reference/docbook/httpinvoker.xml | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/src/reference/docbook/http.xml b/docs/src/reference/docbook/http.xml
index 190034b90f..0bcbecbc0d 100644
--- a/docs/src/reference/docbook/http.xml
+++ b/docs/src/reference/docbook/http.xml
@@ -19,7 +19,7 @@
   definition in <emphasis>web.xml</emphasis>, see
   <xref linkend="httpinvoker-inbound"/> for further details.  Below is an example bean definition for a simple HTTP inbound endpoint.
     <programlisting language="xml"><![CDATA[<bean id="httpInbound" 
-    class="org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway">
+  class="org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway">
   <property name="requestChannel" ref="httpRequestChannel" />
   <property name="replyChannel" ref="httpReplyChannel" />
 </bean>]]></programlisting>
@@ -78,7 +78,7 @@
   <para>
     To configure the <classname>HttpRequestExecutingMessageHandler</classname> write a bean definition like this:
     <programlisting language="xml"><![CDATA[<bean id="httpOutbound" 
-  class="org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler" >
+  class="org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler">
   <constructor-arg value="http://localhost:8080/example" />
   <property name="outputChannel" ref="responseChannel" />
 </bean>]]></programlisting>
@@ -86,7 +86,7 @@
     to a list of HttpMessageConverters to generate the HTTP request body from the Message payload. You can configure those converters as well
     as the ClientHttpRequestFactory instance to use:
     <programlisting language="xml"><![CDATA[<bean id="httpOutbound" 
-    class="org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler" >
+  class="org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler">
   <constructor-arg value="http://localhost:8080/example" />
   <property name="outputChannel" ref="responseChannel" />
   <property name="messageConverters" ref="messageConverterList" />
diff --git a/docs/src/reference/docbook/httpinvoker.xml b/docs/src/reference/docbook/httpinvoker.xml
index a28f86d6f8..ef681b891b 100644
--- a/docs/src/reference/docbook/httpinvoker.xml
+++ b/docs/src/reference/docbook/httpinvoker.xml
@@ -2,9 +2,13 @@
 <chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="httpinvoker"
     xmlns:xlink="http://www.w3.org/1999/xlink">
   <title>HttpInvoker Support</title>
-
+  
   <section id="httpinvoker-intro">
     <title>Introduction</title>
+    <important>
+    This module is DEPRECATED and will be removed in future releases of Spring Integration. Please use HTTP support (<xref linkend="http"/>) which should
+    provide all the functionality that was available with Http Invoker plus more.
+    </important>
     <para>
       HttpInvoker is a Spring-specific remoting option that essentially enables Remote Procedure Calls (RPC) over HTTP.
       In order to accomplish this, an outbound representation of a method invocation is serialized using standard Java