From a42a5a346ec9cacdbca9df28fba4ad34734fc75b Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 29 Apr 2011 16:18:03 -0400
Subject: [PATCH] INT-1647 fixed core schema to work with alternative XML
 parsers (continued)

---
 .../integration/config/xml/spring-integration-2.0.xsd           | 2 +-
 .../config/xml/InboundChannelAdapterWithDefaultPollerTests.java | 2 +-
 2 files changed, 2 insertions(+), 2 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 dd7d9f90ef..afa4fcacd9 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
@@ -680,7 +680,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:choice>
+				<xsd:choice minOccurs="0" maxOccurs="1" >
 					<xsd:sequence> 
 						<xsd:element name="poller" type="basePollerType" /> 
 						<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" /> 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterWithDefaultPollerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterWithDefaultPollerTests.java
index ccb77c5164..db9b22e0ff 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterWithDefaultPollerTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterWithDefaultPollerTests.java
@@ -42,7 +42,7 @@ public class InboundChannelAdapterWithDefaultPollerTests {
 	private SourcePollingChannelAdapter adapter;
 
 
-	@Test @Ignore
+	@Test 
 	public void verifyDefaultPollerInUse() {
 		Trigger trigger = TestUtils.getPropertyValue(adapter, "trigger", Trigger.class);
 		assertEquals(PeriodicTrigger.class, trigger.getClass());