From d0ef062c2e297cf693ae5e8af4548e1ec7395d52 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 22 Oct 2010 21:50:09 -0500
Subject: [PATCH] INT-1487 updated some test config references to
 commons.serializer as well as tooling annotations in schemas

---
 .../integration/config/xml/spring-integration-2.0.xsd         | 4 ++--
 .../integration/ip/config/spring-integration-ip-2.0.xsd       | 4 ++--
 .../integration/ip/config/ParserUnitTests-context.xml         | 4 ++--
 .../ip/tcp/InterceptedSharedConnectionTests-context.xml       | 4 ++--
 .../integration/ip/tcp/SharedConnectionTests-context.xml      | 4 ++--
 .../org/springframework/integration/ip/tcp/common-context.xml | 4 ++--
 .../integration/jdbc/config/spring-integration-jdbc-2.0.xsd   | 4 ++--
 7 files changed, 14 insertions(+), 14 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 001c8bff53..7773ac7671 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
@@ -1707,7 +1707,7 @@
 				</xsd:documentation>
 				<xsd:appinfo>
 					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.commons.serializer.Serializer" />
+						<tool:expected-type type="org.springframework.core.serializer.Serializer" />
 					</tool:annotation>
 				</xsd:appinfo>
 			</xsd:annotation>
@@ -1741,7 +1741,7 @@
 				</xsd:documentation>
 				<xsd:appinfo>
 					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.commons.serializer.Deserializer" />
+						<tool:expected-type type="org.springframework.core.serializer.Deserializer" />
 					</tool:annotation>
 				</xsd:appinfo>
 			</xsd:annotation>
diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
index f1a8098a8b..12dd334a58 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
@@ -294,7 +294,7 @@ the factory, the connection will be closed after a response is received.
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.commons.serializer.Serializer"/>
+							<tool:expected-type type="org.springframework.core.serializer.Serializer"/>
 						</tool:annotation>
 					</xsd:appinfo>
 					<xsd:documentation>
@@ -308,7 +308,7 @@ would normally be the same but this is not required.
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.commons.serializer.Deserializer"/>
+							<tool:expected-type type="org.springframework.core.serializer.Deserializer"/>
 						</tool:annotation>
 					</xsd:appinfo>
 					<xsd:documentation>
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
index f665a16205..649c305013 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
@@ -214,9 +214,9 @@
 	
 	<bean id="interceptors" class="org.springframework.integration.ip.tcp.connection.TcpConnectionInterceptorFactoryChain" />
 	
-	<bean id="defaultSerializer" class="org.springframework.commons.serializer.DefaultSerializer" />
+	<bean id="defaultSerializer" class="org.springframework.core.serializer.support.DefaultSerializer" />
 	
-	<bean id="defaultDeserializer" class="org.springframework.commons.serializer.DefaultDeserializer" />
+	<bean id="defaultDeserializer" class="org.springframework.core.serializer.support.DefaultDeserializer" />
 
 	<ip:tcp-outbound-channel-adapter id="tcpNewOut1"
 		channel="tcpChannel"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
index a708f3c058..40345b63db 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
@@ -9,9 +9,9 @@
 
 	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
 	
-	<bean id="serializer" class="org.springframework.commons.serializer.DefaultSerializer" />
+	<bean id="serializer" class="org.springframework.core.serializer.support.DefaultSerializer" />
 
-	<bean id="deserializer" class="org.springframework.commons.serializer.DefaultDeserializer" />
+	<bean id="deserializer" class="org.springframework.core.serializer.support.DefaultDeserializer" />
 	
 	<bean id="helloWorldInterceptors" class="org.springframework.integration.ip.tcp.connection.TcpConnectionInterceptorFactoryChain">
 		<property name="interceptors">
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
index 81646ba7bd..efdc10666c 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
@@ -11,9 +11,9 @@
 	
 	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
 	
-	<bean id="serializer" class="org.springframework.commons.serializer.DefaultSerializer" />
+	<bean id="serializer" class="org.springframework.core.serializer.support.DefaultSerializer" />
 
-	<bean id="deserializer" class="org.springframework.commons.serializer.DefaultDeserializer" />
+	<bean id="deserializer" class="org.springframework.core.serializer.support.DefaultDeserializer" />
 
 	<int-ip:tcp-connection-factory id="server"
 		type="server"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
index a76a82ad12..1e281caa12 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
@@ -15,8 +15,8 @@
 	<bean id="crLfSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer" />
 	<bean id="stxEtxSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer" />
 	<bean id="lengthHeaderSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayLengthHeaderSerializer" />
-	<bean id="javaSerializer" class="org.springframework.commons.serializer.DefaultSerializer" />
-	<bean id="javaDeserializer" class="org.springframework.commons.serializer.DefaultDeserializer" />
+	<bean id="javaSerializer" class="org.springframework.core.serializer.support.DefaultSerializer" />
+	<bean id="javaDeserializer" class="org.springframework.core.serializer.support.DefaultDeserializer" />
 
 	<ip:tcp-connection-factory id="crLfServer"
 		type="server"
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd
index e53d65fb05..fe9991fbd0 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd
@@ -97,7 +97,7 @@
 							]]></xsd:documentation>
 							<xsd:appinfo>
 								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.commons.serializer.OutputStreamingConverter" />
+									<tool:expected-type type="org.springframework.core.serializer.Serializer" />
 								</tool:annotation>
 							</xsd:appinfo>
 						</xsd:annotation>
@@ -109,7 +109,7 @@
 							]]></xsd:documentation>
 							<xsd:appinfo>
 								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.commons.serializer.InputStreamingConverter" />
+									<tool:expected-type type="org.springframework.core.serializer.Deserializer" />
 								</tool:annotation>
 							</xsd:appinfo>
 						</xsd:annotation>