From d4e9cf5d83c92d2eb052036652e96e1dbb30b830 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 13 Jan 2012 09:37:22 -0500 Subject: [PATCH] NT-2400 Fix tool:expected-type Classes * MessageChannel was moved from core to the base package. * ChannelResolver moved from core to support. * TcpConnectionInterceptorFactoryChain was incorrect. Backport to 2.0.x --- .../config/xml/spring-integration-2.0.xsd | 40 +++++++++---------- .../config/spring-integration-event-2.0.xsd | 6 +-- .../config/spring-integration-file-2.0.xsd | 12 +++--- .../ftp/config/spring-integration-ftp-2.0.xsd | 2 +- .../config/spring-integration-http-2.0.xsd | 12 +++--- .../spring-integration-httpinvoker-2.0.xsd | 4 +- .../ip/config/spring-integration-ip-2.0.xsd | 24 +++++------ .../config/spring-integration-jdbc-2.0.xsd | 8 ++-- .../jms/config/spring-integration-jms-2.0.xsd | 22 +++++----- .../config/spring-integration-mail-2.0.xsd | 10 ++--- .../rmi/config/spring-integration-rmi-2.0.xsd | 4 +- .../config/spring-integration-sftp-2.0.xsd | 4 +- .../config/spring-integration-stream-2.0.xsd | 4 +- .../config/spring-integration-twitter-2.0.xsd | 4 +- .../ws/config/spring-integration-ws-2.0.xsd | 14 +++---- .../xml/config/spring-integration-xml-2.0.xsd | 16 ++++---- .../config/spring-integration-xmpp-2.0.xsd | 8 ++-- 17 files changed, 97 insertions(+), 97 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 65b9fbeda4..87d57ecd3e 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 @@ -27,7 +27,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -556,7 +556,7 @@ - + @@ -643,7 +643,7 @@ - + @@ -830,7 +830,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1994,7 +1994,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2075,7 +2075,7 @@ Name of the header whose value will be used to route messages - + @@ -2114,7 +2114,7 @@ Name of the header whose value will be used to route messages - + @@ -2154,7 +2154,7 @@ Name of the header whose value will be used to route messages - + @@ -2218,7 +2218,7 @@ Name of the header whose value will be used to route messages ]]> - + @@ -2256,7 +2256,7 @@ Name of the header whose value will be used to route messages - + @@ -2283,7 +2283,7 @@ Name of the header whose value will be used to route messages - + Reference to the default channel where Messages should be sent if channel @@ -2492,7 +2492,7 @@ Name of the header whose value will be used to route messages - + @@ -2631,7 +2631,7 @@ Name of the header whose value will be used to route messages - + @@ -2796,7 +2796,7 @@ Name of the header whose value will be used to route messages - + @@ -2812,7 +2812,7 @@ Name of the header whose value will be used to route messages ]]> - + @@ -2980,7 +2980,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -3001,7 +3001,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd index 29748ed275..2f14520520 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd @@ -30,7 +30,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -43,7 +43,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -90,7 +90,7 @@ + type="org.springframework.integration.MessageChannel" /> The Message Channel from which this adapter receives Messages. diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd index 2bd2c0c887..9efa915ea2 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd @@ -49,7 +49,7 @@ - + @@ -157,7 +157,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -181,7 +181,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -190,7 +190,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -295,7 +295,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -304,7 +304,7 @@ Only files matching this regular expression will be picked up by this adapter. - + diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd index cd65aa40b8..c33819fd65 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd @@ -235,7 +235,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd index d7fdd681cb..e224b46c1d 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd @@ -26,7 +26,7 @@ - + @@ -99,7 +99,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + @@ -182,7 +182,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + @@ -247,7 +247,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + @@ -517,7 +517,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + @@ -526,7 +526,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + diff --git a/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd b/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd index a96ea37a3e..488b9e0504 100644 --- a/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd +++ b/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd @@ -66,7 +66,7 @@ - + @@ -75,7 +75,7 @@ - + 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 74de95b463..baeddaa28a 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 @@ -52,7 +52,7 @@ its configuration specifies the number of threads. - + @@ -135,7 +135,7 @@ adapter. - + @@ -144,7 +144,7 @@ adapter. - + @@ -179,7 +179,7 @@ inbound message was received. - + @@ -214,7 +214,7 @@ A connection factory is needed by an inbound adapter. The connection factory mus - + @@ -223,7 +223,7 @@ A connection factory is needed by an inbound adapter. The connection factory mus - + @@ -233,7 +233,7 @@ A connection factory is needed by an inbound adapter. The connection factory mus - + @@ -268,7 +268,7 @@ A connection factory is needed by an outbound adapter. The connection factory mu - + @@ -277,7 +277,7 @@ A connection factory is needed by an outbound adapter. The connection factory mu - + @@ -429,7 +429,7 @@ message headers (ip_connectionId, ip_hostName). Default "true". - + @@ -449,7 +449,7 @@ message headers (ip_connectionId, ip_hostName). Default "true". - + @@ -480,4 +480,4 @@ apply to TCP outbound adapters and gateways. - \ No newline at end of file + 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 59dea96f31..65d6ace1db 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 @@ -188,7 +188,7 @@ sent. - + @@ -279,7 +279,7 @@ to be executed. - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd index 5801b36e5e..2307262b51 100644 --- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd +++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd @@ -381,7 +381,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -467,7 +467,7 @@ - + @@ -578,7 +578,7 @@ - + @@ -588,7 +588,7 @@ - + @@ -598,7 +598,7 @@ - + @@ -653,7 +653,7 @@ - + @@ -662,7 +662,7 @@ - + @@ -838,7 +838,7 @@ - + @@ -1055,7 +1055,7 @@ - + @@ -1064,7 +1064,7 @@ - + diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd index 939c2f376e..2d62b09609 100644 --- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd +++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd @@ -34,7 +34,7 @@ - + @@ -124,7 +124,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -154,7 +154,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -327,7 +327,7 @@ - + diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd index 7610abaf04..8eeadc08fc 100644 --- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd +++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd @@ -85,7 +85,7 @@ - + @@ -94,7 +94,7 @@ - + diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd index 5bb81b5b7d..040b323b74 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd @@ -53,7 +53,7 @@ - + @@ -199,7 +199,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + diff --git a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd index dc5a0f9701..1cac01ae39 100644 --- a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd +++ b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd @@ -34,7 +34,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd index 28861ad7e9..39690a14e8 100644 --- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd +++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd @@ -150,7 +150,7 @@ - + @@ -180,7 +180,7 @@ - + diff --git a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd index 0ce610c4b8..8e1ffdfcc8 100644 --- a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd +++ b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd @@ -43,7 +43,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -339,7 +339,7 @@ - + diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd index c28d265041..14db96a8c3 100644 --- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd +++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd @@ -365,7 +365,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -390,7 +390,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -449,7 +449,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -558,7 +558,7 @@ - + @@ -583,7 +583,7 @@ - + @@ -610,7 +610,7 @@ - + @@ -619,7 +619,7 @@ - + diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd index c316c620d1..46c54e123d 100644 --- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd +++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd @@ -165,7 +165,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -333,7 +333,7 @@ - +