Skip to content

Commit

Permalink
INT-3418: xsd-4.0 -> 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Artem Bilan committed Jun 5, 2014
1 parent c0ab912 commit 77b31f5
Show file tree
Hide file tree
Showing 56 changed files with 854 additions and 17,161 deletions.
835 changes: 0 additions & 835 deletions ...ain/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.0.xsd
View file

This file was deleted.

58 changes: 48 additions & 10 deletions ...ain/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<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="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/>

<xsd:element name="outbound-channel-adapter">
<xsd:annotation>
Expand Down Expand Up @@ -261,6 +261,17 @@
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="reply-timeout" type="xsd:string">
<xsd:annotation>
<xsd:documentation><![CDATA[
Used to set the receiveTimeout on the underlying MessagingTemplate instance
(org.springframework.integration.core.MessagingTemplate) for receiving messages
from the reply channel. If not specified this property will default to "1000"
(1 second). Only applies if the container thread hands off to another thread
before the reply is sent.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Expand Down Expand Up @@ -377,7 +388,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0" maxOccurs="1" />
</xsd:sequence>
<xsd:attribute name="exchange-name" type="xsd:string">
<xsd:annotation>
Expand Down Expand Up @@ -453,8 +464,8 @@ standard headers to also be mapped.
<xsd:attribute name="return-channel" type="xsd:string">
<xsd:annotation>
<xsd:documentation><![CDATA[
Channel to which returned messages will be sent. Requires a RabbitTemplate with the 'mandatory' or
'immediate' properties set to TRUE; requires a CachingConnectionFactory with the 'publisherReturns'
Channel to which returned messages will be sent. Requires a RabbitTemplate with the 'mandatory'
property set to TRUE; requires a CachingConnectionFactory with the 'publisherReturns'
property set to TRUE.
]]></xsd:documentation>
<xsd:appinfo>
Expand All @@ -464,8 +475,29 @@ property set to TRUE.
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="default-delivery-mode">
<xsd:annotation>
<xsd:documentation>
The default delivery mode for messages; 'PERSISTENT' or 'NON_PERSISTENT'. Overridden if the 'header-mapper'
sets the delivery mode. The 'DefaultHeaderMapper' sets the value if the
Spring Integration message header 'amqp_deliveryMode' is present. If this attribute is not supplied and
the header mapper doesn't set it, the default depends on the underlying spring-amqp 'MessagePropertiesConverter'
used by the 'RabbitTemplate'. If that is not customized at all, the default is 'PERSISTENT'.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="deliveryModeEnumeration xsd:string" />
</xsd:simpleType>
</xsd:attribute>
</xsd:complexType>

<xsd:simpleType name="deliveryModeEnumeration">
<xsd:restriction base="xsd:token">
<xsd:enumeration value="PERSISTENT" />
<xsd:enumeration value="NON_PERSISTENT" />
</xsd:restriction>
</xsd:simpleType>

<xsd:complexType name="inboundType">
<xsd:annotation>
<xsd:documentation>
Expand Down Expand Up @@ -652,15 +684,13 @@ standard headers to also be mapped.
<xsd:attribute name="acknowledge-mode">
<xsd:annotation>
<xsd:documentation>
Acknowledge Mode for the MessageListenerContainer.
Acknowledge Mode for the MessageListenerContainer; default 'AUTO'
meaning the adapter automatically acknowledges the message(s)
according to the tx-size.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="AUTO"/>
<xsd:enumeration value="MANUAL"/>
<xsd:enumeration value="NONE"/>
</xsd:restriction>
<xsd:union memberTypes="ackModeEnumeration xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="advice-chain" type="xsd:string">
Expand Down Expand Up @@ -794,4 +824,12 @@ standard headers to also be mapped.
<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
</xsd:attributeGroup>

<xsd:simpleType name="ackModeEnumeration">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="AUTO"/>
<xsd:enumeration value="MANUAL"/>
<xsd:enumeration value="NONE"/>
</xsd:restriction>
</xsd:simpleType>

</xsd:schema>
Loading

0 comments on commit 77b31f5

Please sign in to comment.