From 4872876e4fab813ea0315b3394a2ee355e946d68 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Fri, 13 Jan 2012 13:40:40 -0500
Subject: [PATCH] INT-2400 More expected-type Fixes

CollectionFilter in core; package changes in security.
---
 .../integration/config/xml/spring-integration-2.1.xsd         | 4 ++--
 .../security/config/spring-integration-security-2.0.xsd       | 4 ++--
 .../security/config/spring-integration-security-2.1.xsd       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd
index 001a72160a..1fdb281a6c 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd
@@ -747,11 +747,11 @@
 			<xsd:attribute name="filter" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-						Reference to the implementation of  org.springframework.integration.util.ElementFilter.
+						Reference to the implementation of org.springframework.integration.util.CollectionFilter.
 					</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.util.ElementFilter" />
+							<tool:expected-type type="org.springframework.integration.util.CollectionFilter" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.0.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.0.xsd
index 4158b84ceb..1fde07d437 100644
--- a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.0.xsd
+++ b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.0.xsd
@@ -23,7 +23,7 @@
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.security.AuthenticationManager"/>
+							<tool:expected-type type="org.springframework.security.authentication.AuthenticationManager"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -32,7 +32,7 @@
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.security.AccessDecisionManager"/>
+							<tool:expected-type type="org.springframework.security.access.AccessDecisionManager"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.1.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.1.xsd
index 4158b84ceb..1fde07d437 100644
--- a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.1.xsd
+++ b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-2.1.xsd
@@ -23,7 +23,7 @@
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.security.AuthenticationManager"/>
+							<tool:expected-type type="org.springframework.security.authentication.AuthenticationManager"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -32,7 +32,7 @@
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.security.AccessDecisionManager"/>
+							<tool:expected-type type="org.springframework.security.access.AccessDecisionManager"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>