From ade987d49c85bc34f76f62bd27af42b692506e9e Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 29 Apr 2011 15:30:12 -0400
Subject: [PATCH] INT-1647 fixed core schema to work with alternative XML
 parsers

---
 .../config/xml/spring-integration-2.0.xsd        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
index 554ae90243..dd7d9f90ef 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
@@ -681,14 +681,14 @@
 		<xsd:complexType>
 			<xsd:sequence>
 				<xsd:choice>
-					<xsd:sequence>
-						<xsd:element name="poller" type="basePollerType" minOccurs="0" maxOccurs="1" />
-						<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
-					</xsd:sequence>
-					<xsd:sequence>
-						<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
-						<xsd:element name="poller" type="basePollerType" minOccurs="0" maxOccurs="1" />
-					</xsd:sequence>
+					<xsd:sequence> 
+						<xsd:element name="poller" type="basePollerType" /> 
+						<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" /> 
+					</xsd:sequence> 
+					<xsd:sequence> 
+						<xsd:element ref="beans:bean" /> 
+						<xsd:element name="poller" type="basePollerType" minOccurs="0" maxOccurs="1" /> 
+					</xsd:sequence> 
 				</xsd:choice>
 				<xsd:element name="header" type="headerSubElementType" minOccurs="0" maxOccurs="unbounded" />
 			</xsd:sequence>