From f76f63f23a21acefaf13a172a724c5cac66338f2 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. --- .../config/spring-integration-amqp-2.1.xsd | 14 +++---- .../config/xml/spring-integration-2.0.xsd | 40 +++++++++--------- .../config/xml/spring-integration-2.1.xsd | 42 +++++++++---------- .../config/spring-integration-event-2.0.xsd | 6 +-- .../config/spring-integration-event-2.1.xsd | 6 +-- .../config/spring-integration-file-2.0.xsd | 12 +++--- .../config/spring-integration-file-2.1.xsd | 12 +++--- .../ftp/config/spring-integration-ftp-2.0.xsd | 2 +- .../ftp/config/spring-integration-ftp-2.1.xsd | 6 +-- .../xml/spring-integration-gemfire-2.1.xsd | 6 +-- .../config/spring-integration-http-2.0.xsd | 12 +++--- .../config/spring-integration-http-2.1.xsd | 12 +++--- .../ip/config/spring-integration-ip-2.0.xsd | 24 +++++------ .../ip/config/spring-integration-ip-2.1.xsd | 24 +++++------ .../config/spring-integration-jdbc-2.0.xsd | 8 ++-- .../config/spring-integration-jdbc-2.1.xsd | 16 +++---- .../jms/config/spring-integration-jms-2.0.xsd | 22 +++++----- .../jms/config/spring-integration-jms-2.1.xsd | 22 +++++----- .../config/spring-integration-mail-2.0.xsd | 10 ++--- .../config/spring-integration-mail-2.1.xsd | 10 ++--- .../config/spring-integration-redis-2.1.xsd | 6 +-- .../rmi/config/spring-integration-rmi-2.0.xsd | 4 +- .../rmi/config/spring-integration-rmi-2.1.xsd | 4 +- .../config/spring-integration-sftp-2.0.xsd | 4 +- .../config/spring-integration-sftp-2.1.xsd | 6 +-- .../config/spring-integration-stream-2.0.xsd | 4 +- .../config/spring-integration-stream-2.1.xsd | 4 +- .../config/spring-integration-twitter-2.0.xsd | 4 +- .../config/spring-integration-twitter-2.1.xsd | 4 +- .../ws/config/spring-integration-ws-2.0.xsd | 14 +++---- .../ws/config/spring-integration-ws-2.1.xsd | 14 +++---- .../xml/config/spring-integration-xml-2.0.xsd | 16 +++---- .../xml/config/spring-integration-xml-2.1.xsd | 10 ++--- .../config/spring-integration-xmpp-2.0.xsd | 8 ++-- .../config/spring-integration-xmpp-2.1.xsd | 8 ++-- 35 files changed, 208 insertions(+), 208 deletions(-) diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd index 8b95207c00..94ec420461 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd @@ -36,7 +36,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -124,7 +124,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -157,7 +157,7 @@ this list can also be simple patterns to be matched against the header names (e. + type="org.springframework.integration.MessageChannel"/> @@ -170,7 +170,7 @@ this list can also be simple patterns to be matched against the header names (e. + type="org.springframework.integration.MessageChannel"/> @@ -268,7 +268,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -280,7 +280,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -433,7 +433,7 @@ this list can also be simple patterns to be matched against the header names (e. - + 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 d022d71209..e4cf1644a7 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 @@ - + @@ -821,7 +821,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -1985,7 +1985,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2066,7 +2066,7 @@ Name of the header whose value will be used to route messages - + @@ -2105,7 +2105,7 @@ Name of the header whose value will be used to route messages - + @@ -2145,7 +2145,7 @@ Name of the header whose value will be used to route messages - + @@ -2209,7 +2209,7 @@ Name of the header whose value will be used to route messages ]]> - + @@ -2247,7 +2247,7 @@ Name of the header whose value will be used to route messages - + @@ -2274,7 +2274,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 @@ -2483,7 +2483,7 @@ Name of the header whose value will be used to route messages - + @@ -2625,7 +2625,7 @@ Name of the header whose value will be used to route messages - + @@ -2790,7 +2790,7 @@ Name of the header whose value will be used to route messages - + @@ -2806,7 +2806,7 @@ Name of the header whose value will be used to route messages ]]> - + @@ -2974,7 +2974,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -2995,7 +2995,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + 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 5ef08a4634..001a72160a 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 @@ -27,7 +27,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -556,7 +556,7 @@ - + @@ -655,7 +655,7 @@ - + @@ -914,7 +914,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2251,7 +2251,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2708,7 +2708,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2732,7 +2732,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2754,7 +2754,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2780,7 +2780,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2818,7 +2818,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2859,7 +2859,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. - + @@ -2882,7 +2882,7 @@ is provided, the return value is expected to match a channel name exactly. ]]> - + @@ -3103,7 +3103,7 @@ is provided, the return value is expected to match a channel name exactly. - + @@ -3245,7 +3245,7 @@ is provided, the return value is expected to match a channel name exactly. - + @@ -3410,7 +3410,7 @@ is provided, the return value is expected to match a channel name exactly. - + @@ -3426,7 +3426,7 @@ is provided, the return value is expected to match a channel name exactly. ]]> - + @@ -3594,7 +3594,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -3615,7 +3615,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-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.1.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.1.xsd index dfa50af79e..df96a6dfbf 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.1.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.1.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 b76cdb42f8..d72e33cc11 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 @@ -65,7 +65,7 @@ ]]> - + @@ -184,7 +184,7 @@ Only files matching this regular expression will be picked up by this adapter. The channel through which outgoing messages will arrive. - + @@ -209,7 +209,7 @@ Only files matching this regular expression will be picked up by this adapter. The channel through which outgoing messages will arrive. - + @@ -222,7 +222,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -370,7 +370,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -384,7 +384,7 @@ Only files matching this regular expression will be picked up by this adapter. - + diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.1.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.1.xsd index ae9d8e6e76..85cef0cd58 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.1.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.1.xsd @@ -65,7 +65,7 @@ ]]> - + @@ -183,7 +183,7 @@ Only files matching this regular expression will be picked up by this adapter. The channel through which outgoing messages will arrive. - + @@ -208,7 +208,7 @@ Only files matching this regular expression will be picked up by this adapter. The channel through which outgoing messages will arrive. - + @@ -221,7 +221,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -369,7 +369,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -383,7 +383,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-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd index ac2677d130..eb4babc1c7 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd @@ -263,7 +263,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -278,7 +278,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -392,7 +392,7 @@ - + diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd index d6ea9db984..6ad5d2f2b0 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd @@ -152,7 +152,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -187,7 +187,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -199,7 +199,7 @@ + type="org.springframework.integration.MessageChannel" /> 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-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.1.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.1.xsd index 549449d65e..4d4a0c1a08 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.1.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.1.xsd @@ -36,7 +36,7 @@ - + @@ -123,7 +123,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + @@ -223,7 +223,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + @@ -288,7 +288,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + @@ -589,7 +589,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + @@ -598,7 +598,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re - + 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-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd index af597cb7b1..92592f47a0 100644 --- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd +++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd @@ -52,7 +52,7 @@ its configuration specifies the number of threads. - + @@ -137,7 +137,7 @@ task executors such as a WorkManagerTaskExecutor. - + @@ -146,7 +146,7 @@ task executors such as a WorkManagerTaskExecutor. - + @@ -196,7 +196,7 @@ task executors such as a WorkManagerTaskExecutor. - + @@ -246,7 +246,7 @@ task executors such as a WorkManagerTaskExecutor. - + @@ -255,7 +255,7 @@ task executors such as a WorkManagerTaskExecutor. - + @@ -265,7 +265,7 @@ task executors such as a WorkManagerTaskExecutor. - + @@ -315,7 +315,7 @@ task executors such as a WorkManagerTaskExecutor. - + @@ -324,7 +324,7 @@ task executors such as a WorkManagerTaskExecutor. - + @@ -478,7 +478,7 @@ message headers (ip_connectionId, ip_hostName). Default "true". - + @@ -506,7 +506,7 @@ connections created by this factory. Facilitates resequencing if necessary. Defa - + @@ -581,4 +581,4 @@ default is 0. Values can be negative. See SmartLifeCycle. - \ 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-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd index 44cc7b1352..0beea9e102 100644 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd @@ -186,7 +186,7 @@ sent. - + @@ -277,7 +277,7 @@ to be executed. - + @@ -410,7 +410,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -692,7 +692,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -909,7 +909,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -923,7 +923,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -1106,7 +1106,7 @@ + type="org.springframework.integration.MessageChannel" /> 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-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd index f01f48e1a7..ac88b1c7f6 100644 --- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd +++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd @@ -410,7 +410,7 @@ - + @@ -430,7 +430,7 @@ - + @@ -493,7 +493,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -614,7 +614,7 @@ - + @@ -624,7 +624,7 @@ - + @@ -704,7 +704,7 @@ - + @@ -713,7 +713,7 @@ - + @@ -943,7 +943,7 @@ - + @@ -1160,7 +1160,7 @@ - + @@ -1169,7 +1169,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-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.1.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.1.xsd index 4780b5bc10..2bbbf0f1d1 100644 --- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.1.xsd +++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.1.xsd @@ -34,7 +34,7 @@ - + @@ -112,7 +112,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -142,7 +142,7 @@ - + @@ -306,7 +306,7 @@ - + @@ -315,7 +315,7 @@ - + diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd index 0b45003ada..72ff4f449c 100644 --- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd +++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd @@ -180,7 +180,7 @@ - + @@ -192,7 +192,7 @@ Channel to which Error Messages will be sent. - + @@ -230,7 +230,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-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd index aa4e260136..10d4bc56d7 100644 --- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd +++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.1.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-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.1.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.1.xsd index 45d58a6b12..c0cf8beb98 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.1.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.1.xsd @@ -267,7 +267,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -281,7 +281,7 @@ + type="org.springframework.integration.MessageChannel" /> @@ -394,7 +394,7 @@ + type="org.springframework.integration.MessageChannel" /> 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-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.1.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.1.xsd index 6022059051..34cefab8c4 100644 --- a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.1.xsd +++ b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.1.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-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd index 8469a71096..a26ca9e37c 100644 --- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd +++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd @@ -148,7 +148,7 @@ - + @@ -176,7 +176,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-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.1.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.1.xsd index f3775c8108..69cff02988 100644 --- a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.1.xsd +++ b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.1.xsd @@ -44,7 +44,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -276,7 +276,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -285,7 +285,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -302,7 +302,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -416,7 +416,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -425,7 +425,7 @@ this list can also be simple patterns to be matched against the header names (e. - + 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-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd index b15a786886..84da9e4c80 100644 --- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd +++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd @@ -686,7 +686,7 @@ - + @@ -698,7 +698,7 @@ - + @@ -710,7 +710,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -736,7 +736,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 @@ - + diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.1.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.1.xsd index 9fa573229e..60102fe825 100644 --- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.1.xsd +++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.1.xsd @@ -165,7 +165,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -365,7 +365,7 @@ - +