Start version 5.3

* Move `What's New` into `changes-5.1-5.2.adoc`
* Remove version from the `XSD` files:
 1. Align with SF
 2. The version for XSD doesn't matter for the current jar version,
 since only the version is available in classpath is from the current
 jar version
 3. Modify `spring.schemas` to map all the possible versions for XSD
 into the current one in a jar.
 This way target applications can upgrade without changing the version
 for XSD location and we don't need to require `versionless` variant
 any more
 4. The jar in classpath can handle only its own XSD, so independently
 of version or no-version variants we still may fail because the current
 jar may not support end-user code any more - need some fix over there
 anyway.
* Remove `checkTestConfigs` Gradle task since we don't worry about XSD
version any more
* Modify `schemaZip` Gradle task to populate XSDs into a distribution
still with a version to avoid overriding on-line XSDs for version `1.0.x`.
We may consider not do that since SF doesn't and just bite a bullet
for always overriding those on-line XSDs to the actual one from the latest
release.
This commit is contained in:
Artem Bilan
2019-11-27 17:51:35 -05:00
parent 1a9fb83199
commit 9dc3519f20
71 changed files with 4106 additions and 3358 deletions

View File

@@ -1,4 +1,24 @@
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-3.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.3.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-3.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.3.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.0.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.1.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd
https\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml.xsd

View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.springframework.org/schema/integration/xml"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:integration="http://www.springframework.org/schema/integration"
targetNamespace="http://www.springframework.org/schema/integration/xml"
elementFormDefault="qualified" attributeFormDefault="unqualified">
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:integration="http://www.springframework.org/schema/integration"
targetNamespace="http://www.springframework.org/schema/integration/xml"
elementFormDefault="qualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" />
<xsd:import namespace="http://www.springframework.org/schema/tool" />
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
<xsd:import namespace="http://www.springframework.org/schema/tool"/>
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd"/>
schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/>
<xsd:annotation>
<xsd:documentation>
Defines the configuration elements for Spring Integration's XML support.
Defines the configuration elements for Spring Integration's XML support.
</xsd:documentation>
</xsd:annotation>
@@ -25,12 +25,12 @@
marshalling transformer.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType >
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="inputOutputEndpoint">
<xsd:sequence>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" />
minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="marshaller" type="xsd:string" use="required">
<xsd:annotation>
@@ -41,25 +41,27 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="result-type" use="optional">
<xsd:attribute name="result-type">
<xsd:simpleType>
<xsd:union memberTypes="resultType xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="result-factory" type="xsd:string" use="optional">
<xsd:attribute name="result-factory" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.xml.result.ResultFactory"/>
<tool:expected-type
type="org.springframework.integration.xml.result.ResultFactory"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="result-transformer" type="xsd:string" use="optional">
<xsd:attribute name="result-transformer" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.xml.transformer.ResultTransformer"/>
<tool:expected-type
type="org.springframework.integration.xml.transformer.ResultTransformer"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -67,8 +69,9 @@
<xsd:attribute name="extract-payload" type="xsd:string" default="true">
<xsd:annotation>
<xsd:documentation>
Specify whether to extract the payload before passing to the Marshaller. By default, this
value is "true". To have the full Message passed instead, set this to "false".
Specify whether to extract the payload before passing to the Marshaller. By default,
this
value is "true". To have the full Message passed instead, set this to "false".
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
@@ -89,7 +92,7 @@
<xsd:extension base="inputOutputEndpoint">
<xsd:sequence>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" />
minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="unmarshaller" type="xsd:string" use="required">
<xsd:annotation>
@@ -116,8 +119,8 @@
<xsd:extension base="inputOutputEndpoint">
<xsd:sequence>
<xsd:element name="xslt-param" type="paramType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation><![CDATA[
<xsd:annotation>
<xsd:documentation><![CDATA[
Allows to configure individual Xslt parameters.
There the 'expression' and 'value' attribute are
available. The expression attribute should be
@@ -131,10 +134,10 @@
You can also use property placeholders (e.g.,
${some.value}).
]]></xsd:documentation>
</xsd:annotation>
</xsd:annotation>
</xsd:element>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" />
minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="xslt-param-headers" type="xsd:string" use="optional">
<xsd:annotation>
@@ -187,7 +190,8 @@
]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.xml.source.SourceFactory"/>
<tool:expected-type
type="org.springframework.integration.xml.source.SourceFactory"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -201,7 +205,8 @@
]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.xml.result.ResultFactory"/>
<tool:expected-type
type="org.springframework.integration.xml.result.ResultFactory"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -238,7 +243,8 @@
]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.xml.transformer.ResultTransformer"/>
<tool:expected-type
type="org.springframework.integration.xml.transformer.ResultTransformer"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -274,21 +280,22 @@
<xsd:extension base="inputOutputEndpoint">
<xsd:sequence>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" />
minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="xpath-expression" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
The XPath expression string to be evaluated against the input Message's payload.
Either this or 'xpath-expression-ref' must be provided, but not both.
The XPath expression string to be evaluated against the input Message's payload.
Either this or 'xpath-expression-ref' must be provided, but not both.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="xpath-expression-ref" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Reference to the XPathExpression instance to be evaluated against the input Message's payload.
Either this or 'xpath-expression' must be provided, but not both.
Reference to the XPathExpression instance to be evaluated against the input Message's
payload.
Either this or 'xpath-expression' must be provided, but not both.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
@@ -300,7 +307,8 @@
<xsd:attribute name="evaluation-type" default="STRING_RESULT">
<xsd:annotation>
<xsd:documentation>
The result type expected from the XPath evaluation. This will be the payload type of the output Message.
The result type expected from the XPath evaluation. This will be the payload type of the
output Message.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
@@ -310,9 +318,11 @@
<xsd:attribute name="node-mapper">
<xsd:annotation>
<xsd:documentation>
Reference to a NodeMapper. If this is provided, the 'evaluation-type' will be ignored. Instead, the
org.springframework.xml.xpath.XPathExpression's evaluateAsObject(Node node, NodeMapper nodeMapper)
method will be invoked.
Reference to a NodeMapper. If this is provided, the 'evaluation-type' will be ignored.
Instead, the
org.springframework.xml.xpath.XPathExpression's evaluateAsObject(Node node, NodeMapper
nodeMapper)
method will be invoked.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
@@ -324,12 +334,13 @@
<xsd:attribute name="converter">
<xsd:annotation>
<xsd:documentation>
Specify the XmlPayloadConverter to use when converting a Message payload prior to XPath evaluation.
The DefaultXmlPayloadConverter is used if this reference is not provided, and it
should be sufficient in most cases since it can convert from Node, Document, Source,
File, and String typed payloads. If you need to extend beyond the capabilities of
that default implementation, then an upstream Transformer is probably a better option
than providing a reference to a custom implementation of this strategy here.
Specify the XmlPayloadConverter to use when converting a Message payload prior to XPath
evaluation.
The DefaultXmlPayloadConverter is used if this reference is not provided, and it
should be sufficient in most cases since it can convert from Node, Document, Source,
File, and String typed payloads. If you need to extend beyond the capabilities of
that default implementation, then an upstream Transformer is probably a better option
than providing a reference to a custom implementation of this strategy here.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
@@ -356,31 +367,35 @@
<xsd:sequence maxOccurs="unbounded">
<xsd:element type="xpathHeaderType" name="header"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" />
minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="default-overwrite">
<xsd:annotation>
<xsd:documentation>
Specify the default boolean value for whether to overwrite existing header values. This will
only take effect for sub-elements that do not provide their own 'overwrite' attribute. If the
'default-overwrite' attribute is not provided, then the specified header values will NOT
overwrite any existing ones with the same header names.
Specify the default boolean value for whether to overwrite existing header values. This
will
only take effect for sub-elements that do not provide their own 'overwrite' attribute.
If the
'default-overwrite' attribute is not provided, then the specified header values will NOT
overwrite any existing ones with the same header names.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="should-skip-nulls">
<xsd:annotation>
<xsd:documentation>
Specify whether null values, such as might be returned from an expression evaluation, should be
skipped. The default value is true. Set this to false if a null value should trigger removal of
the corresponding header instead.
Specify whether null values, such as might be returned from an expression evaluation,
should be
skipped. The default value is true. Set this to false if a null value should trigger
removal of
the corresponding header instead.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="converter">
@@ -407,27 +422,28 @@
<xsd:complexType name="xpathHeaderType">
<xsd:annotation>
<xsd:documentation>
Defines an XPath expression to be configured within an &lt;xpath-header-enricher/&gt; element.
Defines an XPath expression to be configured within an &lt;xpath-header-enricher/&gt; element.
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="name" type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation>
The name of the header to be enriched.
The name of the header to be enriched.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="xpath-expression">
<xsd:annotation>
<xsd:documentation>
The XPath Expression as a String. Either this or 'xpath-expression-ref' must be provided, but not both.
The XPath Expression as a String. Either this or 'xpath-expression-ref' must be provided, but not
both.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="xpath-expression-ref">
<xsd:annotation>
<xsd:documentation>
The XPath Expression reference. Either this or 'xpath-expression' must be provided, but not both.
The XPath Expression reference. Either this or 'xpath-expression' must be provided, but not both.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
@@ -439,7 +455,7 @@
<xsd:attribute name="evaluation-type" default="STRING_RESULT">
<xsd:annotation>
<xsd:documentation>
The result type expected from the XPath evaluation. This will be the type of the header value.
The result type expected from the XPath evaluation. This will be the type of the header value.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
@@ -449,12 +465,12 @@
<xsd:attribute name="overwrite">
<xsd:annotation>
<xsd:documentation>
Boolean value to indicate whether this header value should overwrite an existing header value
for the same name if already present on the input Message.
Boolean value to indicate whether this header value should overwrite an existing header value
for the same name if already present on the input Message.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="header-type" type="xsd:string">
@@ -471,9 +487,9 @@
<xsd:complexType name="commonXPathRouterType" abstract="true">
<xsd:complexContent>
<xsd:extension base="integration:abstractRouterType">
<xsd:attribute name="evaluate-as-string" default="false">
<xsd:annotation>
<xsd:documentation><![CDATA[
<xsd:attribute name="evaluate-as-string" default="false">
<xsd:annotation>
<xsd:documentation><![CDATA[
By default XPath expressions are evaluated as NODESET type and then converted
to a List of channel names, thus handling single channel scenarios as well as multiple.
However certain XPath expressions may evaluate to String type results from the very
@@ -484,9 +500,9 @@
evaluation type. It is 'false' by default, however if
set to 'true', then the String evaluation type will be used.
]]></xsd:documentation>
</xsd:annotation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional">
@@ -512,8 +528,8 @@
<xsd:complexContent>
<xsd:extension base="commonXPathRouterType">
<xsd:sequence>
<xsd:element ref="integration:poller" minOccurs="0" />
<xsd:element ref="xpath-expression" minOccurs="0" >
<xsd:element ref="integration:poller" minOccurs="0"/>
<xsd:element ref="xpath-expression" minOccurs="0">
<xsd:annotation>
<xsd:documentation><![CDATA[
Internally XPath expressions will be evaluated as
@@ -530,7 +546,8 @@
]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="mapping" type="integration:mappingValueChannelType" minOccurs="0" maxOccurs="unbounded">
<xsd:element name="mapping" type="integration:mappingValueChannelType" minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation><![CDATA[
If the values returned by the XPath Expression
@@ -550,10 +567,10 @@
</xsd:annotation>
</xsd:element>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" />
</xsd:sequence>
<xsd:attributeGroup ref="integration:topLevelRouterAttributeGroup"/>
<xsd:attribute name="converter" type="xsd:string">
minOccurs="0"/>
</xsd:sequence>
<xsd:attributeGroup ref="integration:topLevelRouterAttributeGroup"/>
<xsd:attribute name="converter" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Specify the Converter to use when converting payloads prior to XPath evaluation.
@@ -595,7 +612,8 @@
]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="mapping" type="integration:mappingValueChannelType" minOccurs="0" maxOccurs="unbounded">
<xsd:element name="mapping" type="integration:mappingValueChannelType" minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation><![CDATA[
If the values returned by the XPath Expression
@@ -687,7 +705,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="matchTypeEnumeration xsd:string" />
<xsd:union memberTypes="matchTypeEnumeration xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
</xsd:extension>
@@ -747,9 +765,9 @@
<xsd:complexContent>
<xsd:extension base="inputOutputEndpoint">
<xsd:sequence>
<xsd:element ref="xpath-expression" minOccurs="0" />
<xsd:element ref="xpath-expression" minOccurs="0"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" />
minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional">
<xsd:annotation>
@@ -777,7 +795,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="apply-sequence" use="optional" default="true">
@@ -791,7 +809,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="output-properties">
@@ -817,18 +835,19 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="discard-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel" />
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
The channel where the splitter will send the messages that return an empty container from
The channel where the splitter will send the messages that return an empty container
from
split function.
</xsd:documentation>
</xsd:annotation>
@@ -856,7 +875,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.xml.validation.XmlValidator" />
<tool:expected-type type="org.springframework.xml.validation.XmlValidator"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -868,7 +887,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.xml.XmlPayloadConverter" />
<tool:expected-type type="org.springframework.integration.xml.XmlPayloadConverter"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -887,12 +906,12 @@
<xsd:complexType name="baseFilterType">
<xsd:annotation>
<xsd:documentation>
Base type for XML filters.
Base type for XML filters.
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="integration:poller" minOccurs="0"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0" />
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="discard-channel" type="xsd:string">
@@ -902,7 +921,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel" />
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -920,9 +939,9 @@
</xsd:complexType>
<xsd:complexType name="paramType">
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="expression" type="xsd:string" use="optional"/>
<xsd:attribute name="value" type="xsd:string" use="optional"/>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="expression" type="xsd:string" use="optional"/>
<xsd:attribute name="value" type="xsd:string" use="optional"/>
</xsd:complexType>
<xsd:simpleType name="resultType">
@@ -934,18 +953,18 @@
<xsd:simpleType name="evaluationType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="BOOLEAN_RESULT"/>
<xsd:enumeration value="STRING_RESULT"/>
<xsd:enumeration value="NUMBER_RESULT"/>
<xsd:enumeration value="NODE_RESULT"/>
<xsd:enumeration value="NODE_LIST_RESULT"/>
<xsd:enumeration value="BOOLEAN_RESULT"/>
<xsd:enumeration value="STRING_RESULT"/>
<xsd:enumeration value="NUMBER_RESULT"/>
<xsd:enumeration value="NODE_RESULT"/>
<xsd:enumeration value="NODE_LIST_RESULT"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="schemaType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="xml-schema"/>
<xsd:enumeration value="relax-ng"/>
<xsd:enumeration value="xml-schema"/>
<xsd:enumeration value="relax-ng"/>
</xsd:restriction>
</xsd:simpleType>