Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3793: Fix Namespace Inconsistency

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3793

Also fix a couple typos in the TCP/IP chapter
This commit is contained in:
Gary Russell
2015-08-05 09:39:29 -04:00
committed by Artem Bilan
parent 288201867a
commit 315ed056d8
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/reference/docbook/chain.xml
View File

@@ -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>:
<programlisting language="xml"><![CDATA[<int:chain input-channel="input">
<si-xml:marshalling-transformer marshaller="marshaller" result-type="StringResult" />
<int-xml:marshalling-transformer marshaller="marshaller" result-type="StringResult" />
<int:service-activator ref="someService" method="someMethod"/>
<int:header-enricher>
<int:header name="foo" value="bar"/>

8
src/reference/docbook/ip.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="ip"
xmlns:xlink="http://www.w3.org/1999/xlink">
>
<title>TCP and UDP Support</title>
<para>
Spring Integration provides Channel Adapters for receiving and sending messages over internet protocols. Both UDP
@@ -355,7 +355,7 @@
<section id="caching-cf">
<title>TCP Caching Client Connection Factory</title>
<para>
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 @@
<para>
To improve performance, users could use collaborating channel adapters
instead of gateways, but that requires application-level message
correlation. See <xref linkend="ip-correlation" />for more information.
correlation. See
<xref linkend="ip-correlation"/>
for more information.
</para>
<para>
Spring Integration 2.2 introduced a caching client connection factory,

10
src/reference/docbook/samples.xml
View File

@@ -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.
</para>
<note>
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`.
</note>
<para>
First the order is split into a number of messages, each one representing a single order item using
the XPath splitter component.
<programlisting language="xml"><![CDATA[<int-xml:xpath-splitter id="orderItemSplitter" input-channel="ordersChannel"
<programlisting language="xml"><![CDATA[<si-xml:xpath-splitter id="orderItemSplitter" input-channel="ordersChannel"
output-channel="stockCheckerChannel" create-documents="true">
<int-xml:xpath-expression expression="/orderNs:order/orderNs:orderItem"
<si-xml:xpath-expression expression="/orderNs:order/orderNs:orderItem"
namespace-map="orderNamespaceMap" />
</int-xml:xpath-splitter>]]></programlisting>
</para>
@@ -703,7 +707,7 @@ That includes Samples; so, if you can't find what you are looking for, let us kn
<para>
Where the order item is not in stock the message is transformed using
xslt into a format suitable for sending to the supplier.
<programlisting language="xml"><![CDATA[<int-xml:xslt-transformer input-channel="outOfStockChannel"
<programlisting language="xml"><![CDATA[<si-xml:xslt-transformer input-channel="outOfStockChannel"
output-channel="resupplyOrderChannel"
xsl-resource="classpath:org/springframework/integration/samples/xml/bigBooksSupplierTransformer.xsl"/>]]></programlisting>
</para>

6
src/reference/docbook/xml.xml
View File

@@ -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:
</para>
<programlisting language="xml"><![CDATA[<si-xml:xpath-expression expression="/:order/:orderItem"
<programlisting language="xml"><![CDATA[<int-xml:xpath-expression expression="/:order/:orderItem"
ns-prefix="" ns-uri="http://www.example.org/prodcuts"/>]]></programlisting>
<para>
Of course you can also provide any other arbitrarily chosen namespace prefix.
The following XPath expression using the <emphasis>myorder</emphasis>
namespace prefix will match also:
</para>
<programlisting language="xml"><![CDATA[<si-xml:xpath-expression expression="/myorder:order/myorder:orderItem"
<programlisting language="xml"><![CDATA[<int-xml:xpath-expression expression="/myorder:order/myorder:orderItem"
ns-prefix="myorder" ns-uri="http://www.example.org/prodcuts"/>]]></programlisting>
<para>
It is important to remember that the namespace URI is the really important
@@ -913,7 +913,7 @@
channels are determined dynamically.
</para>
<programlisting language="xml"><![CDATA[<int-xml:xpath-router id="orderTypeRouter" input-channel="orderChannel">
<si-xml:xpath-expression expression="/order/type"/>
<int-xml:xpath-expression expression="/order/type"/>
</int-xml:xpath-router>]]></programlisting>
<note>