INT-3898: Fix <xsd:all> usage

JIRA: https://jira.spring.io/browse/INT-3898

Some XML validator like `xercesImpl` doesn't allow `minOccurs` and `maxOccurs` on the `<xsd:all`.

* Remove them in favor of `minOccurs`/`maxOccurs` on the nested elements.
* Add `<poller>` for the `<int-jmx:notification-publishing-channel-adapter>`
This commit is contained in:
Artem Bilan
2016-01-20 12:26:44 -05:00
parent 62db308c22
commit 2024b8a4b3
2 changed files with 9 additions and 8 deletions

View File

@@ -4239,8 +4239,8 @@ unless bean with this name is already registered.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:all minOccurs="0" maxOccurs="1">
<xsd:element ref="beans:bean" />
<xsd:all>
<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1"/>
</xsd:all>
<xsd:attribute name="ref" type="xsd:string" use="optional">
<xsd:annotation>
@@ -4285,7 +4285,7 @@ The list of component name patterns you want to track (e.g., tracked-components
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="control-bus-type">
<xsd:all minOccurs="0" maxOccurs="1">
<xsd:all>
<xsd:element name="poller" type="basePollerType" minOccurs="0" maxOccurs="1" />
</xsd:all>
<xsd:attributeGroup ref="inputOutputChannelGroup" />