From a5031020e75217881f545bc0c4dd615ff19013c6 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Sun, 1 Aug 2010 15:49:23 +0000
Subject: [PATCH] INT-1307 Updated schema to make sure its compatible with Java
 5 (when using <xsd:any namespace="##other"..> and <beans:bean. . .> element
 we were violating Unique Particle Attribute, so sine we already say
 any-other, there is no need to explicitly include <beans:bean>),  changed
 ControlBusXmlTest.anonymousConsumerRegistered() since it was throwing
 MalformedObjectNameException: invalid character '*' which was used in
 'generated=*'

---
 .../config/xml/spring-integration-2.0.xsd           | 13 +++----------
 .../integration/control/ControlBusXmlTests.java     |  2 +-
 2 files changed, 4 insertions(+), 11 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 e9a5ed0644..4f02c2796d 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
@@ -990,8 +990,7 @@
 			<xsd:element name="object-to-string-transformer" type="specialized-transformer-type"/>
 			<xsd:element name="object-to-map-transformer" type="specialized-transformer-type"/>
 			<xsd:element name="map-to-object-transformer" type="map-to-object-transformer-type"/>
-			<xsd:element ref="beans:bean"/>
-						
+					
 			<xsd:element name="chain" type="chain-type"/>
 		</xsd:choice>
 	</xsd:complexType>
@@ -1780,10 +1779,7 @@ Name of the header whose value to use.
 				<xsd:extension base="channelNameResolvingRouterType">
 					<xsd:choice minOccurs="0" maxOccurs="2">
 						<xsd:element name="poller" type="innerPollerType" minOccurs="0" maxOccurs="1" />
-						<xsd:choice minOccurs="0" maxOccurs="1">
-							<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
-							<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="1" />
-						</xsd:choice>
+						<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="1" />
 					</xsd:choice>
 					<xsd:attribute name="ref" type="xsd:string">
 						<xsd:annotation>
@@ -2282,10 +2278,7 @@ Name of the header whose value to use.
 			<xsd:extension base="handlerEndpointType">
 				<xsd:choice minOccurs="0" maxOccurs="2">
 					<xsd:element name="poller" type="innerPollerType" minOccurs="0" maxOccurs="1" />
-					<xsd:choice minOccurs="0" maxOccurs="1">
-						<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
-						<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="1" />
-					</xsd:choice>
+					<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="1" />
 				</xsd:choice>
 			</xsd:extension>
 		</xsd:complexContent>
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests.java
index 8786021946..3b9a8801b3 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests.java
@@ -72,7 +72,7 @@ public class ControlBusXmlTests {
 	@Test
 	public void anonymousConsumerRegistered() throws Exception {
 		Set<ObjectInstance> instances = mbeanServer.queryMBeans(
-				ObjectNameManager.getInstance(DOMAIN + ":type=endpoint,name=anonymous,generated=*"), null);
+				ObjectNameManager.getInstance(DOMAIN + ":type=endpoint,name=anonymous,*"), null);
 		assertEquals(1, instances.size());
 		assertEquals(EventDrivenConsumer.class.getName(), instances.iterator().next().getClassName());
 	}