From 315ed056d8f9c5382d1f7c86677f5e88db3d53d8 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 5 Aug 2015 09:39:29 -0400 Subject: [PATCH] INT-3793: Fix Namespace Inconsistency JIRA: https://jira.spring.io/browse/INT-3793 Also fix a couple typos in the TCP/IP chapter --- src/reference/docbook/chain.xml | 2 +- src/reference/docbook/ip.xml | 8 +++++--- src/reference/docbook/samples.xml | 10 +++++++--- src/reference/docbook/xml.xml | 6 +++--- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/reference/docbook/chain.xml b/src/reference/docbook/chain.xml index bc3c116ad8..87e09d3240 100644 --- a/src/reference/docbook/chain.xml +++ b/src/reference/docbook/chain.xml @@ -76,7 +76,7 @@ The <chain> can be configured as the last 'black-box' consumer of the message flow. For this solution it is enough to put at the end of the <chain> some <outbound-channel-adapter>: - + diff --git a/src/reference/docbook/ip.xml b/src/reference/docbook/ip.xml index 513ee48411..2d67e9088e 100644 --- a/src/reference/docbook/ip.xml +++ b/src/reference/docbook/ip.xml @@ -1,6 +1,6 @@ +> TCP and UDP Support Spring Integration provides Channel Adapters for receiving and sending messages over internet protocols. Both UDP @@ -355,7 +355,7 @@
TCP Caching Client Connection Factory - As noted above, TCP sockets cam be 'single-use' (one request/response) + As noted above, TCP sockets can be 'single-use' (one request/response) or shared. Shared sockets do not perform well with outbound gateways, in high-volume environments, because the socket can only process one request/response at a time. @@ -363,7 +363,9 @@ To improve performance, users could use collaborating channel adapters instead of gateways, but that requires application-level message - correlation. See for more information. + correlation. See + + for more information. Spring Integration 2.2 introduced a caching client connection factory, diff --git a/src/reference/docbook/samples.xml b/src/reference/docbook/samples.xml index b78cf406ed..96b6a6476a 100644 --- a/src/reference/docbook/samples.xml +++ b/src/reference/docbook/samples.xml @@ -681,12 +681,16 @@ That includes Samples; so, if you can't find what you are looking for, let us kn some of the provided components which deal with xml payloads. The sample uses the idea of processing an order for books represented as xml. + + This sample shows that the namespace prefix can be whatever you want; while we usually use, `int-xml` for + integration XML components, the sample uses `si-xml`. + First the order is split into a number of messages, each one representing a single order item using the XPath splitter component. - - ]]> @@ -703,7 +707,7 @@ That includes Samples; so, if you can't find what you are looking for, let us kn Where the order item is not in stock the message is transformed using xslt into a format suitable for sending to the supplier. - ]]> diff --git a/src/reference/docbook/xml.xml b/src/reference/docbook/xml.xml index 819d0026d0..f6b0152df9 100644 --- a/src/reference/docbook/xml.xml +++ b/src/reference/docbook/xml.xml @@ -287,14 +287,14 @@ If you leave the colon off, the XPath expression will not match. The following XPath Expression will match agains the XML document above: - ]]> Of course you can also provide any other arbitrarily chosen namespace prefix. The following XPath expression using the myorder namespace prefix will match also: - ]]> It is important to remember that the namespace URI is the really important @@ -913,7 +913,7 @@ channels are determined dynamically. - + ]]>