Skip to content

Commit 4a8dfa0

Browse files
committed
* Fix spring-integration-xml.xsd for duplicates
1 parent ff8819d commit 4a8dfa0

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml.xsd

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<?xml version="1.0" encoding="UTF-8"?>
32
<xsd:schema xmlns="http://www.springframework.org/schema/integration/xml"
43
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -493,7 +492,7 @@
493492
<xsd:documentation><![CDATA[
494493
By default XPath expressions are evaluated as NODESET type and then converted
495494
to a List of channel names, thus handling single channel scenarios as well as multiple.
496-
However certain XPath expressions may evaluate to String type results from the very
495+
However, certain XPath expressions may evaluate to String type results from the very
497496
beginning (e.g., 'name(./node())' - which will return the name of the root node) thus resulting in
498497
an exception if the default evaluation type (NODESET) is used.
499498
@@ -506,7 +505,7 @@
506505
<xsd:union memberTypes="xsd:boolean xsd:string"/>
507506
</xsd:simpleType>
508507
</xsd:attribute>
509-
<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional">
508+
<xsd:attribute name="xpath-expression-ref" type="xsd:string">
510509
<xsd:annotation>
511510
<xsd:documentation>
512511
Reference to the XPathExpression instance to be
@@ -535,13 +534,13 @@
535534
<xsd:documentation><![CDATA[
536535
Internally XPath expressions will be evaluated as
537536
NODESET type and converted to a List<String>
538-
representing channel names. Typically such a list
537+
representing channel names. Typically, such a list
539538
will contain a single channel name. However,
540539
based on the results of an XPath Expression, the
541540
XPath router can also take on the characteristics
542541
of a Recipient List Router if the XPath Expression
543-
returns more then one value. In that case, the
544-
List<String> will contain more then one channel
542+
returns more than one value. In that case, the
543+
List<String> will contain more than one channel
545544
name and consequently Messages will be sent to
546545
all channels in the list.
547546
]]></xsd:documentation>
@@ -588,14 +587,6 @@
588587
</xsd:appinfo>
589588
</xsd:annotation>
590589
</xsd:attribute>
591-
<xsd:attribute name="order" type="xsd:string">
592-
<xsd:annotation>
593-
<xsd:documentation>
594-
The order for dispatching when this router is connected
595-
as a subscriber to a 'SubscribableChannel'.
596-
</xsd:documentation>
597-
</xsd:annotation>
598-
</xsd:attribute>
599590
</xsd:extension>
600591
</xsd:complexContent>
601592
</xsd:complexType>

0 commit comments

Comments
 (0)