diff --git a/build.gradle b/build.gradle index 1344f7bbdf..e055fa66e1 100644 --- a/build.gradle +++ b/build.gradle @@ -101,6 +101,7 @@ subprojects { subproject -> openJpaVersion = '2.3.0' pahoMqttClientVersion = '0.4.0' postgresVersion = '9.1-901-1.jdbc4' + reactorVersion = '1.1.0.RELEASE' romeVersion = '1.0.0' saajApiVersion = '1.3.5' saajImplVersion = '1.3.23' @@ -242,6 +243,7 @@ project('spring-integration-core') { compile "org.springframework:spring-messaging:$springVersion" compile "org.springframework:spring-tx:$springVersion" compile "org.springframework.retry:spring-retry:$springRetryVersion" + compile "org.projectreactor:reactor-core:$reactorVersion" compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional) compile("com.fasterxml.jackson.core:jackson-databind:$jackson2Version", optional) compile("com.jayway.jsonpath:json-path:$jsonpathVersion", optional) @@ -596,6 +598,14 @@ project('spring-integration-twitter') { } } +project('spring-integration-websocket') { + description = 'Spring Integration WebSockets Support' + dependencies { + compile project(":spring-integration-core") + compile "org.springframework:spring-websocket:$springVersion" + } +} + project('spring-integration-ws') { description = 'Spring Integration Web Services Support' dependencies { @@ -747,6 +757,8 @@ task schemaZip(type: Zip) { description = "Builds -${classifier} archive containing all " + "XSDs for deployment at static.springframework.org/schema." + duplicatesStrategy = 'exclude' + subprojects.each { subproject -> def Properties schemas = new Properties(); def shortName = subproject.name.replaceFirst("${rootProject.name}-", '') diff --git a/gradle.properties b/gradle.properties index 44210f42ab..9e5b62b270 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=4.0.3.BUILD-SNAPSHOT +version=4.1.0.BUILD-SNAPSHOT diff --git a/settings.gradle b/settings.gradle index 6316cc190b..1ac37962f9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -26,6 +26,7 @@ include 'spring-integration-stream' include 'spring-integration-syslog' include 'spring-integration-test' include 'spring-integration-twitter' +include 'spring-integration-websocket' include 'spring-integration-ws' include 'spring-integration-xml' include 'spring-integration-xmpp' diff --git a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas index b8beb95817..d8d07e5505 100644 --- a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas @@ -1,5 +1,2 @@ -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-3.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.0.xsd -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.0.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd diff --git a/spring-integration-core/.springBeans b/spring-integration-core/.springBeans deleted file mode 100644 index b854542b58..0000000000 --- a/spring-integration-core/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java index 621cc45cfe..0da6259bff 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java @@ -44,7 +44,7 @@ public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHa protected final Log logger = LogFactory.getLog(this.getClass()); - private static final String VERSION = "4.0"; + private static final String VERSION = "4.1"; private final NamespaceHandlerDelegate delegate = new NamespaceHandlerDelegate(); diff --git a/spring-integration-core/src/main/resources/META-INF/spring.schemas b/spring-integration-core/src/main/resources/META-INF/spring.schemas index 7086cb554f..50902a7f77 100644 --- a/spring-integration-core/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-core/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd -http\://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd -http\://www.springframework.org/schema/integration/spring-integration-2.1.xsd=org/springframework/integration/config/xml/spring-integration-2.1.xsd -http\://www.springframework.org/schema/integration/spring-integration-2.2.xsd=org/springframework/integration/config/xml/spring-integration-2.2.xsd -http\://www.springframework.org/schema/integration/spring-integration-3.0.xsd=org/springframework/integration/config/xml/spring-integration-3.0.xsd -http\://www.springframework.org/schema/integration/spring-integration-4.0.xsd=org/springframework/integration/config/xml/spring-integration-4.0.xsd -http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-4.0.xsd +http\://www.springframework.org/schema/integration/spring-integration-4.1.xsd=org/springframework/integration/config/xml/spring-integration-4.1.xsd +http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-4.1.xsd diff --git a/spring-integration-event/.springBeans b/spring-integration-event/.springBeans deleted file mode 100644 index 6f4c287497..0000000000 --- a/spring-integration-event/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/spring-integration-event/src/main/resources/META-INF/spring.schemas b/spring-integration-event/src/main/resources/META-INF/spring.schemas index 7ec203de8f..00d1c2569e 100644 --- a/spring-integration-event/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-event/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/event/spring-integration-event-2.0.xsd=org/springframework/integration/event/config/spring-integration-event-2.0.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event-2.1.xsd=org/springframework/integration/event/config/spring-integration-event-2.1.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event-2.2.xsd=org/springframework/integration/event/config/spring-integration-event-2.2.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event-3.0.xsd=org/springframework/integration/event/config/spring-integration-event-3.0.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event-4.0.xsd=org/springframework/integration/event/config/spring-integration-event-4.0.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-4.0.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-4.1.xsd=org/springframework/integration/event/config/spring-integration-event-4.1.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-4.1.xsd diff --git a/spring-integration-feed/.gitignore b/spring-integration-feed/.gitignore deleted file mode 100644 index ea8c4bf7f3..0000000000 --- a/spring-integration-feed/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/spring-integration-feed/src/main/resources/META-INF/spring.schemas b/spring-integration-feed/src/main/resources/META-INF/spring.schemas index b2c3a1c267..fae60e455f 100644 --- a/spring-integration-feed/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-feed/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/feed/spring-integration-feed-2.0.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd -http\://www.springframework.org/schema/integration/feed/spring-integration-feed-2.1.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd -http\://www.springframework.org/schema/integration/feed/spring-integration-feed-2.2.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd -http\://www.springframework.org/schema/integration/feed/spring-integration-feed-3.0.xsd=org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd -http\://www.springframework.org/schema/integration/feed/spring-integration-feed-4.0.xsd=org/springframework/integration/feed/config/spring-integration-feed-4.0.xsd -http\://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd=org/springframework/integration/feed/config/spring-integration-feed-4.0.xsd +http\://www.springframework.org/schema/integration/feed/spring-integration-feed-4.1.xsd=org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd +http\://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd=org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd diff --git a/spring-integration-file/.springBeans b/spring-integration-file/.springBeans deleted file mode 100644 index 97f972fc8d..0000000000 --- a/spring-integration-file/.springBeans +++ /dev/null @@ -1,14 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/file/config/config.xml - - - - diff --git a/spring-integration-file/src/main/resources/META-INF/spring.schemas b/spring-integration-file/src/main/resources/META-INF/spring.schemas index a3f3ed8c5d..a9b9134f63 100644 --- a/spring-integration-file/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-file/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd=org/springframework/integration/file/config/spring-integration-file-1.0.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd=org/springframework/integration/file/config/spring-integration-file-2.0.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file-2.1.xsd=org/springframework/integration/file/config/spring-integration-file-2.1.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file-2.2.xsd=org/springframework/integration/file/config/spring-integration-file-2.2.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd=org/springframework/integration/file/config/spring-integration-file-3.0.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd=org/springframework/integration/file/config/spring-integration-file-4.0.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-4.0.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd=org/springframework/integration/file/config/spring-integration-file-4.1.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-4.1.xsd diff --git a/spring-integration-ftp/.springBeans b/spring-integration-ftp/.springBeans deleted file mode 100644 index ad7b5a4b38..0000000000 --- a/spring-integration-ftp/.springBeans +++ /dev/null @@ -1,14 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml - - - - diff --git a/spring-integration-ftp/log4j.properties b/spring-integration-ftp/log4j.properties deleted file mode 100644 index c4672eb722..0000000000 --- a/spring-integration-ftp/log4j.properties +++ /dev/null @@ -1,8 +0,0 @@ -log4j.rootCategory=WARN, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n - -log4j.category.org.springframework=WARN -log4j.category.org.springframework.integration=DEBUG diff --git a/spring-integration-ftp/src/main/resources/META-INF/spring.schemas b/spring-integration-ftp/src/main/resources/META-INF/spring.schemas index 9dd9b5b171..9dacaea750 100644 --- a/spring-integration-ftp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-ftp/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd -http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd -http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd -http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-3.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd -http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-4.0.xsd -http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-4.0.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd diff --git a/spring-integration-gemfire/.gitignore b/spring-integration-gemfire/.gitignore deleted file mode 100644 index 2e2298678e..0000000000 --- a/spring-integration-gemfire/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.cfg \ No newline at end of file diff --git a/spring-integration-gemfire/.springBeans b/spring-integration-gemfire/.springBeans deleted file mode 100644 index 4b08dc36b5..0000000000 --- a/spring-integration-gemfire/.springBeans +++ /dev/null @@ -1,16 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests-context.xml - src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests-context.xml - src/test/java/org/springframework/integration/gemfire/store/gemfire-queue-context.xml - - - - diff --git a/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas b/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas index 0104f93578..9d3691cbaa 100644 --- a/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas @@ -1,5 +1,2 @@ -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.2.xsd -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-3.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.0.xsd -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.0.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd diff --git a/spring-integration-groovy/.springBeans b/spring-integration-groovy/.springBeans deleted file mode 100644 index 7aab2afffb..0000000000 --- a/spring-integration-groovy/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/spring-integration-groovy/src/main/resources/META-INF/spring.schemas b/spring-integration-groovy/src/main/resources/META-INF/spring.schemas index 3a668dc32f..e335de5b1d 100644 --- a/spring-integration-groovy/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-groovy/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.0.xsd -http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.1.xsd -http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd -http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-3.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-3.0.xsd -http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-4.0.xsd -http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-4.0.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd diff --git a/spring-integration-http/.springBeans b/spring-integration-http/.springBeans deleted file mode 100644 index ca9c181739..0000000000 --- a/spring-integration-http/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/spring-integration-http/src/main/resources/META-INF/spring.schemas b/spring-integration-http/src/main/resources/META-INF/spring.schemas index e5406df34e..13f911f447 100644 --- a/spring-integration-http/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-http/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/http/spring-integration-http-1.0.xsd=org/springframework/integration/http/config/spring-integration-http-1.0.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd=org/springframework/integration/http/config/spring-integration-http-2.0.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http-2.1.xsd=org/springframework/integration/http/config/spring-integration-http-2.1.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http-2.2.xsd=org/springframework/integration/http/config/spring-integration-http-2.2.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http-3.0.xsd=org/springframework/integration/http/config/spring-integration-http-3.0.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http-4.0.xsd=org/springframework/integration/http/config/spring-integration-http-4.0.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-4.0.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-4.1.xsd=org/springframework/integration/http/config/spring-integration-http-4.1.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-4.1.xsd diff --git a/spring-integration-ip/.springBeans b/spring-integration-ip/.springBeans deleted file mode 100644 index 2dfc932cdc..0000000000 --- a/spring-integration-ip/.springBeans +++ /dev/null @@ -1,16 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/ip/tcp/connection/SOLingerTests-context.xml - src/test/java/org/springframework/integration/ip/tcp/AutoStartTests-context.xml - src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests-context.xml - - - - diff --git a/spring-integration-ip/src/main/resources/META-INF/spring.schemas b/spring-integration-ip/src/main/resources/META-INF/spring.schemas index c0ea244e56..a1d8980e64 100644 --- a/spring-integration-ip/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-ip/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.0.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd -http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.1.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd -http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.2.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.2.xsd -http\://www.springframework.org/schema/integration/ip/spring-integration-ip-3.0.xsd=org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd -http\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.0.xsd=org/springframework/integration/ip/config/spring-integration-ip-4.0.xsd -http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-4.0.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.1.xsd=org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd diff --git a/spring-integration-jdbc/.springBeans b/spring-integration-jdbc/.springBeans deleted file mode 100644 index adda0a3213..0000000000 --- a/spring-integration-jdbc/.springBeans +++ /dev/null @@ -1,14 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayWithPollerTest-context.xml - - - - diff --git a/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas b/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas index c76873f167..a6e356f079 100644 --- a/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd -http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd -http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd -http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-3.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd -http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-4.0.xsd -http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-4.0.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-4.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd diff --git a/spring-integration-jms/.springBeans b/spring-integration-jms/.springBeans deleted file mode 100644 index bafca86c72..0000000000 --- a/spring-integration-jms/.springBeans +++ /dev/null @@ -1,15 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests-context.xml - src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests-context.xml - - - - diff --git a/spring-integration-jms/src/main/resources/META-INF/spring.schemas b/spring-integration-jms/src/main/resources/META-INF/spring.schemas index a33bf6becf..3505ce82df 100644 --- a/spring-integration-jms/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jms/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd=org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd -http\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd=org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd -http\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.1.xsd=org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd -http\://www.springframework.org/schema/integration/jms/spring-integration-jms-2.2.xsd=org/springframework/integration/jms/config/spring-integration-jms-2.2.xsd -http\://www.springframework.org/schema/integration/jms/spring-integration-jms-3.0.xsd=org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd -http\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.0.xsd=org/springframework/integration/jms/config/spring-integration-jms-4.0.xsd -http\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms-4.0.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-4.1.xsd=org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd diff --git a/spring-integration-jmx/.springBeans b/spring-integration-jmx/.springBeans deleted file mode 100644 index f44e0e7cd4..0000000000 --- a/spring-integration-jmx/.springBeans +++ /dev/null @@ -1,14 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests-context.xml - - - - diff --git a/spring-integration-jmx/src/main/resources/META-INF/spring.schemas b/spring-integration-jmx/src/main/resources/META-INF/spring.schemas index 23dc6155da..7f2b7cc960 100644 --- a/spring-integration-jmx/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jmx/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-2.0.xsd -http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.1.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-2.1.xsd -http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-2.2.xsd -http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-3.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-3.0.xsd -http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-4.0.xsd -http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-4.0.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-4.1.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd diff --git a/spring-integration-jpa/src/main/resources/META-INF/spring.schemas b/spring-integration-jpa/src/main/resources/META-INF/spring.schemas index c916216e57..ea958e94a3 100644 --- a/spring-integration-jpa/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jpa/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,2 @@ -http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-2.2.xsd=org/springframework/integration/jpa/config/xml/spring-integration-jpa-2.2.xsd -http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-3.0.xsd=org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd -http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.0.xsd=org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.0.xsd -http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.0.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.1.xsd=org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.1.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.1.xsd diff --git a/spring-integration-mail/.springBeans b/spring-integration-mail/.springBeans deleted file mode 100644 index 5a41740f54..0000000000 --- a/spring-integration-mail/.springBeans +++ /dev/null @@ -1,15 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/mail/config/MailOutboundWithJavamailProperties-context.xml - src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests-context.xml - - - - diff --git a/spring-integration-mail/src/main/resources/META-INF/spring.schemas b/spring-integration-mail/src/main/resources/META-INF/spring.schemas index 87ac635790..ec90243e7a 100644 --- a/spring-integration-mail/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-mail/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd=org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd -http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd=org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd -http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.1.xsd=org/springframework/integration/mail/config/spring-integration-mail-2.1.xsd -http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.2.xsd=org/springframework/integration/mail/config/spring-integration-mail-2.2.xsd -http\://www.springframework.org/schema/integration/mail/spring-integration-mail-3.0.xsd=org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd -http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.0.xsd=org/springframework/integration/mail/config/spring-integration-mail-4.0.xsd -http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-4.0.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.1.xsd=org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd diff --git a/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas b/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas index ff8ca2607f..ef0dccb82b 100644 --- a/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,2 @@ -http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-2.2.xsd -http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-3.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-3.0.xsd -http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-4.0.xsd -http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-4.0.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-4.1.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-4.1.xsd diff --git a/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas b/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas index 275cfb4314..c17303e98a 100644 --- a/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.0.xsd=org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.0.xsd -http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.0.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.1.xsd=org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.1.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.1.xsd diff --git a/spring-integration-redis/src/main/resources/META-INF/spring.schemas b/spring-integration-redis/src/main/resources/META-INF/spring.schemas index 0b8bd92b0a..94d6eef4c6 100644 --- a/spring-integration-redis/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-redis/src/main/resources/META-INF/spring.schemas @@ -1,5 +1,2 @@ -http\://www.springframework.org/schema/integration/redis/spring-integration-redis-2.1.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd -http\://www.springframework.org/schema/integration/redis/spring-integration-redis-2.2.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.2.xsd -http\://www.springframework.org/schema/integration/redis/spring-integration-redis-3.0.xsd=org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd -http\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.0.xsd=org/springframework/integration/redis/config/spring-integration-redis-4.0.xsd -http\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-4.0.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-4.1.xsd=org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd diff --git a/spring-integration-rmi/src/main/resources/META-INF/spring.schemas b/spring-integration-rmi/src/main/resources/META-INF/spring.schemas index 3cf5e4f204..1cade32861 100644 --- a/spring-integration-rmi/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-rmi/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-1.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-1.0.xsd -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-2.2.xsd -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-3.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-4.0.xsd -http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-4.0.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-4.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd diff --git a/spring-integration-scripting/.springBeans b/spring-integration-scripting/.springBeans deleted file mode 100644 index 7aab2afffb..0000000000 --- a/spring-integration-scripting/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/spring-integration-scripting/src/main/resources/META-INF/spring.schemas b/spring-integration-scripting/src/main/resources/META-INF/spring.schemas index e484aa11a3..d82143708b 100644 --- a/spring-integration-scripting/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-scripting/src/main/resources/META-INF/spring.schemas @@ -1,10 +1,4 @@ -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-2.1.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-2.2.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-3.0.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-4.0.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-4.0.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-2.1.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-3.0.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-4.0.xsd -http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-4.0.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-4.1.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-4.1.xsd diff --git a/spring-integration-security/.springBeans b/spring-integration-security/.springBeans deleted file mode 100644 index 85a1da38fa..0000000000 --- a/spring-integration-security/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/spring-integration-security/src/main/resources/META-INF/spring.schemas b/spring-integration-security/src/main/resources/META-INF/spring.schemas index 947c60c959..65c210d085 100644 --- a/spring-integration-security/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-security/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/security/spring-integration-security-1.0.xsd=org/springframework/integration/security/config/spring-integration-security-1.0.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security-2.0.xsd=org/springframework/integration/security/config/spring-integration-security-2.0.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security-2.1.xsd=org/springframework/integration/security/config/spring-integration-security-2.1.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security-2.2.xsd=org/springframework/integration/security/config/spring-integration-security-2.2.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security-3.0.xsd=org/springframework/integration/security/config/spring-integration-security-3.0.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security-4.0.xsd=org/springframework/integration/security/config/spring-integration-security-4.0.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-4.0.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-4.1.xsd=org/springframework/integration/security/config/spring-integration-security-4.1.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-4.1.xsd diff --git a/spring-integration-sftp/.springBeans b/spring-integration-sftp/.springBeans deleted file mode 100644 index ab7a2a4581..0000000000 --- a/spring-integration-sftp/.springBeans +++ /dev/null @@ -1,15 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests-context.xml - src/test/java/org/springframework/integration/sftp/config/SftpInboundAutostartup-context.xml - - - - diff --git a/spring-integration-sftp/src/main/resources/META-INF/spring.schemas b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas index e04e4e2128..3da0e70b92 100644 --- a/spring-integration-sftp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-2.1.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-2.2.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-3.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.0.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.0.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd diff --git a/spring-integration-stream/src/main/resources/META-INF/spring.schemas b/spring-integration-stream/src/main/resources/META-INF/spring.schemas index c4e994a2ca..ddedf98a5f 100644 --- a/spring-integration-stream/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-stream/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd=org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd -http\://www.springframework.org/schema/integration/stream/spring-integration-stream-2.0.xsd=org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd -http\://www.springframework.org/schema/integration/stream/spring-integration-stream-2.1.xsd=org/springframework/integration/stream/config/spring-integration-stream-2.1.xsd -http\://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd=org/springframework/integration/stream/config/spring-integration-stream-2.2.xsd -http\://www.springframework.org/schema/integration/stream/spring-integration-stream-3.0.xsd=org/springframework/integration/stream/config/spring-integration-stream-3.0.xsd -http\://www.springframework.org/schema/integration/stream/spring-integration-stream-4.0.xsd=org/springframework/integration/stream/config/spring-integration-stream-3.0.xsd -http\://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd=org/springframework/integration/stream/config/spring-integration-stream-4.0.xsd +http\://www.springframework.org/schema/integration/stream/spring-integration-stream-4.1.xsd=org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd +http\://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd=org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd diff --git a/spring-integration-syslog/src/main/resources/META-INF/spring.schemas b/spring-integration-syslog/src/main/resources/META-INF/spring.schemas index ad49066c29..d7959691eb 100644 --- a/spring-integration-syslog/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-syslog/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,2 @@ -http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-3.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd -http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-4.0.xsd -http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-4.0.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.1.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-4.1.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-4.1.xsd diff --git a/spring-integration-test/.springBeans b/spring-integration-test/.springBeans deleted file mode 100644 index 85a1da38fa..0000000000 --- a/spring-integration-test/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/spring-integration-test/src/main/resources/.svnignore b/spring-integration-test/src/main/resources/.svnignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/spring-integration-twitter/src/main/resources/META-INF/spring.schemas b/spring-integration-twitter/src/main/resources/META-INF/spring.schemas index 317ef88c68..775ce243f8 100644 --- a/spring-integration-twitter/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-twitter/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-2.0.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd -http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-2.1.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd -http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-2.2.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-2.2.xsd -http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-3.0.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-3.0.xsd -http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-4.0.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-4.0.xsd -http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-4.0.xsd +http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-4.1.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd +http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd diff --git a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketNamespaceHandler.java b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketNamespaceHandler.java new file mode 100644 index 0000000000..a54ce94fb2 --- /dev/null +++ b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketNamespaceHandler.java @@ -0,0 +1,31 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.websocket.config; + +import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler; + +/** + * @author Artem Bilan + * @since 4.1 + */ +public class WebSocketNamespaceHandler extends AbstractIntegrationNamespaceHandler { + + public void init() { + + } + +} diff --git a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/package-info.java b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/package-info.java new file mode 100644 index 0000000000..88c7e807fe --- /dev/null +++ b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/package-info.java @@ -0,0 +1,4 @@ +/** + * Contains parser classes for the WebSockets namespace support. + */ +package org.springframework.integration.websocket.config; diff --git a/spring-integration-websocket/src/main/resources/META-INF/spring.handlers b/spring-integration-websocket/src/main/resources/META-INF/spring.handlers new file mode 100644 index 0000000000..c51d0afe29 --- /dev/null +++ b/spring-integration-websocket/src/main/resources/META-INF/spring.handlers @@ -0,0 +1 @@ +http\://www.springframework.org/schema/integration/websocket=org.springframework.integration.websocket.config.WebSocketNamespaceHandler diff --git a/spring-integration-websocket/src/main/resources/META-INF/spring.schemas b/spring-integration-websocket/src/main/resources/META-INF/spring.schemas new file mode 100644 index 0000000000..278e1c0bb9 --- /dev/null +++ b/spring-integration-websocket/src/main/resources/META-INF/spring.schemas @@ -0,0 +1,2 @@ +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-4.1.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd diff --git a/spring-integration-websocket/src/main/resources/META-INF/spring.tooling b/spring-integration-websocket/src/main/resources/META-INF/spring.tooling new file mode 100644 index 0000000000..e680448cde --- /dev/null +++ b/spring-integration-websocket/src/main/resources/META-INF/spring.tooling @@ -0,0 +1,4 @@ +# Tooling related information for the integration websocket namespace +http\://www.springframework.org/schema/integration/websocket@name=integration websocket Namespace +http\://www.springframework.org/schema/integration/websocket@prefix=int-websocket +http\://www.springframework.org/schema/integration/websocket@icon=org/springframework/integration/websocket/config/spring-integration-websocket.gif diff --git a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd new file mode 100644 index 0000000000..135e445abc --- /dev/null +++ b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket.gif b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket.gif new file mode 100644 index 0000000000..750667e608 Binary files /dev/null and b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket.gif differ diff --git a/spring-integration-ws/src/main/resources/META-INF/spring.schemas b/spring-integration-ws/src/main/resources/META-INF/spring.schemas index 0074544a40..3a2df4fa12 100644 --- a/spring-integration-ws/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-ws/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd -http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd -http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.1.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.1.xsd -http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.2.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.2.xsd -http\://www.springframework.org/schema/integration/ws/spring-integration-ws-3.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd -http\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-4.0.xsd -http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-4.0.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-4.1.xsd=org/springframework/integration/ws/config/spring-integration-ws-4.1.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-4.1.xsd diff --git a/spring-integration-xml/.springBeans b/spring-integration-xml/.springBeans deleted file mode 100644 index 211af10331..0000000000 --- a/spring-integration-xml/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/spring-integration-xml/src/main/resources/META-INF/spring.schemas b/spring-integration-xml/src/main/resources/META-INF/spring.schemas index 000a17339d..e01954e4e1 100644 --- a/spring-integration-xml/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-xml/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,2 @@ -http\://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd -http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd -http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.1.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd -http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.2.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.2.xsd -http\://www.springframework.org/schema/integration/xml/spring-integration-xml-3.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-3.0.xsd -http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-4.0.xsd -http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-4.0.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-4.1.xsd=org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd diff --git a/spring-integration-xmpp/.springBeans b/spring-integration-xmpp/.springBeans deleted file mode 100644 index b8cee390df..0000000000 --- a/spring-integration-xmpp/.springBeans +++ /dev/null @@ -1,14 +0,0 @@ - - - 1 - - - - - - - src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTest-context.xml - - - - diff --git a/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas b/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas index 93756713e7..4cf7ae7f42 100644 --- a/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas @@ -1,6 +1,2 @@ -http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd -http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-2.1.xsd -http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-2.2.xsd -http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-3.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd -http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-4.0.xsd -http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-4.0.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-4.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd diff --git a/src/reference/docbook/changes-3.0-4.0.xml b/src/reference/docbook/changes-3.0-4.0.xml index b5e1f78c00..febb964d32 100644 --- a/src/reference/docbook/changes-3.0-4.0.xml +++ b/src/reference/docbook/changes-3.0-4.0.xml @@ -2,8 +2,375 @@
Changes between 3.0 and 4.0 - - For an overview of the changes in Spring Integration 4.0 since version 3.0, - please see . - + + Please be sure to also see the + Migration Guide for important changes that might affect your applications. + Migration guides for all versions back to 2.1 can be found on the + Wiki. + +
+ New Components +
+ MQTT Channel Adapters + + The MQTT channel adapters (previously available in the Spring Integration Extensions repository) + are now available as part of the normal Spring Integration distribution. + See + +
+
+ @EnableIntegration + + The @EnableIntegration annotation has been added, to permit declaration of + standard Spring Integration beans when using @Configuration classes. + See for more information. + +
+
+ @IntegrationComponentScan + + The @IntegrationComponentScan annotation has been added, to permit classpath + scanning for Spring Integration specific components. + See for more information. + +
+
+ @EnableMessageHistory + + Message history can now be enabled with the @EnableMessageHistory annotation in a + @Configuration class; in addition the message history settings can be modified + by a JMX MBean. In addition auto-created MessageHandlers for + annotated endpoints (e.g. @ServiceActivator, @Splitter etc.) + now are also trackable by MessageHistory. For more information, see . + +
+
+ @MessagingGateway + + Messaging gateway interfaces can now be configured with the @MessagingGateway annotation. + It is an analogue of the <int:gateway/> xml element. + For more information, see . + +
+
+ Spring Boot @EnableAutoConfiguration + + As well as the @EnableIntegration annotation mentioned above, a + a hook has been introduced to allow the + Spring Integration infrastructure beans to be configured using Spring Boot's + @EnableAutoConfiguration. + For more information see + Spring Boot - AutoConfigure. + +
+
+ @GlobalChannelInterceptor + + As well as the @EnableIntegration annotation mentioned above, + the @GlobalChannelInterceptor annotation has bean introduced. + For more information, see . + +
+
+ @IntegrationConverter + + The @IntegrationConverter annotation has bean introduced, + as an analogue of <int:converter/> component. + For more information, see . + +
+
+ @EnablePublisher + + The @EnablePublisher annotation has been added, to allow the specification of a + default-publisher-channel for @Publisher annotations. + See for more information. + +
+
+ Redis Channel Message Stores + + A new Redis MessageGroupStore, that is optimized for + use when backing a QueueChannel for persistence, is now + provided. + For more information, see . + + + A new Redis ChannelPriorityMessageStore is now + provided. This can be used to retrieve messages by priority. + For more information, see . + +
+
+ MongodDB Channel Message Store + + MongoDB support now provides the MongoDbChannelMessageStore - + a channel specific MessageStore implementation. + With priorityEnabled = true, it can be used in + <int:priority-queue>s to achieve priority order polling of + persisted messages. For more information see . + +
+
+ @EnableIntegrationMBeanExport + + The IntegrationMBeanExporter can now be enabled with the @EnableIntegrationMBeanExport + annotation in a @Configuration class. For more information, see . + +
+
+ ChannelSecurityInterceptorFactoryBean + + Configuration of Spring Security for message channels using @Configuration classes is + now supported by using a ChannelSecurityInterceptorFactoryBean. + For more information, see . + +
+
+ Redis Command Gateway + + The Redis support now provides the <outbound-gateway> component + to perform generic Redis commands using the RedisConnection#execute method. + For more information, see . + +
+
+ RedisLockRegistry and GemfireLockRegistry + + The RedisLockRegistry and GemfireLockRegistry are now + available supporting global locks visible to multiple application instances/servers. + These can be used with aggregating message handlers across multiple application instances such + that group release will occur on only one instance. + For more information, see , + and . + +
+
+ @Poller + + Annotation-based messaging configuration can now have a poller attribute. + This means that methods annotated with (@ServiceActivator, + @Aggregator etc.) can now use an inputChannel that + is a reference to a PollableChannel. + For more information, see . + +
+
+ @InboundChannelAdapter and SmartLifecycle for Annotated Endpoints + + The @InboundChannelAdapter method annotation is now available. + It is an analogue of the <int:inbound-channel-adapter> XML component. + In addition, all Messaging Annotations now provide SmartLifecycle options. + For more information, see . + +
+
+ Twitter Search Outbound Gateway + + A new twitter endpoint <int-twitter-search-outbound-gateway/> + has been added. Unlike the search inbound adapter which polls using the same search + query each time, the outbound gateway allows on-demand customized queries. + For more information, see . + +
+
+ Gemfire Metadata Store + + The GemfireMetadataStore is provided, allowing it to be used, for example, + in a AbstractPersistentAcceptOnceFileListFilter + implementation in a multiple application instance/server environment. + For more information, see , + , and + . + +
+
+ @BridgeFrom and @BridgeTo Annotations + + Annotation and Java configuration has introduced @BridgeFrom and + @BridgeTo @Bean method annotations to mark + MessageChannel beans in + @Configuration classes. + For more information, see . + +
+
+ Meta Messaging Annotations + + Messaging Annotations (@ServiceActivator, @Router, + @MessagingGateway etc.) can now be configured as meta-annotations for user-defined + Messaging Annotations. In addition the user-defined annotations can have the same attributes + (inputChannel, @Poller, autoStartup etc.). + For more information, see . + +
+
+ +
+ General Changes +
+ Requires Spring Framework 4.0 + + Core messaging abstractions (Message, + MessageChannel etc) have moved to the Spring + Framework spring-messaging module. Users who reference these + classes directly in their code will need to make changes as described in + the first section of the + Migration Guide. + +
+
+ Header Type for XPath Header Enricher + + The header-type attribute has been introduced for the header sub-element of the + <int-xml:xpath-header-enricher>. This attribute provides the target type for + the header value to which the result of the XPath expression evaluation will be converted. + For more information see . + +
+
+ Object To Json Transformer: Node Result + + The result-type attribute has been introduced for the <int:object-to-json-transformer>. + This attribute provides the target type for the result of object mapping to JSON. + It supports STRING (default) and NODE. + For more information see . + +
+
+ JMS Header Mapping + + The DefaultJmsHeaderMapper now maps an incoming JMSPriority header to + the Spring Integration priority header. Previously priority was only + considered for outbound messages. For more information see . + +
+
+ JMS Outbound Channel Adapter + + The JMS outbound channel adapter now supports the session-transacted attribute + (default false). Previously, you had to inject a customized JmsTemplate + to use transactions. See . + +
+
+ JMS Inbound Channel Adapter + + The JMS inbound channel adapter now supports the session-transacted attribute + (default false). Previously, you had to inject a customized JmsTemplate + to use transactions (the adapter allowed 'transacted' in the acknowledgeMode which was + incorrect, and didn't work; this value is no longer allowed). See + . + +
+
+ Datatype Channels + + You can now specify a MessageConverter to be used when converting + (if necessary) payloads to one of the accepted datatypes in a Datatype channel. + For more information see . + +
+
+ Simpler Retry Advice Configuration + + Simplified namespace support has been added to configure a + RequestHandlerRetryAdvice. + For more information see . + +
+
+ Correlation Endpoint: Time-based Release Strategy + + The mutually exclusive group-timeout and group-timeout-expression + attributes have been added to the <int:aggregator> and <int:resequencer>. + These attributes allow forced completion of a partial MessageGroup, + if the ReleaseStrategy does not release a group and no + further messages arrive within the time specified. + For more information see . + +
+
+ Redis Metadata Store + + The RedisMetadataStore now implements ConcurrentMetadataStore, allowing it to be used, for example, + in a AbstractPersistentAcceptOnceFileListFilter + implementation in a multiple application instance/server environment. + For more information, see , + , and + . + +
+
+ JdbcChannelMessageStore and PriorityChannel + + The JdbcChannelMessageStore now implements + PriorityCapableChannelMessageStore, allowing it to be used as + a message-store reference for priority-queues. + For more information, see . + +
+
+ AMQP Endpoints Delivery Mode + + Spring AMQP, by default, creates persistent messages on the broker. This behavior can be + overridden by setting the amqp_deliveryMode header and/or customizing the + mappers. A convenient default-delivery-mode attribute has now been added + to the adapters to provide easier configuration of this important setting. + For more information, see and + . + +
+
+ FTP Timeouts + + The DefaultFtpSessionFactory now exposes the + connectTimeout, defaultTimeout and dataTimeout + properties, avoiding the need to subclass the factory just to set these common + properties. The postProcess* methods are still available for more + advanced configuration. See for more information. + +
+
+ Twitter: StatusUpdatingMessageHandler + + The StatusUpdatingMessageHandler (<int-twitter:outbound-channel-adapter>) + now supports the tweet-data-expression attribute to build a + org.springframework.social.twitter.api.TweetData object for updating the + timeline status allowing, for example, attaching an image. + See for more information. + +
+
+ JPA Retrieving Gateway: id-expression + + The id-expression attribute has been introduced for + <int-jpa:retrieving-outbound-gateway> to perform + EntityManager.find(Class entityClass, Object primaryKey). + See for more information. + +
+
+ TCP Deserialization Events + + When one of the standard deserializers encounters a problem decoding the input stream to + a message, it will now emit a TcpDeserializationExceptionEvent, allowing + applications to examine the data at the point the exception occurred. + See for more information. + +
+
+ Messaging Annotations on @Bean Definitions + + Messaging Annotations (@ServiceActivator, @Router, + @InboundChannelAdapter etc.) can now be configured on @Bean + definitions in @Configuration classes. + For more information, see . + +
+
diff --git a/src/reference/docbook/changes-4.0-4.1.xml b/src/reference/docbook/changes-4.0-4.1.xml new file mode 100644 index 0000000000..80f6377ee8 --- /dev/null +++ b/src/reference/docbook/changes-4.0-4.1.xml @@ -0,0 +1,9 @@ + +
+ Changes between 4.0 and 4.1 + + For an overview of the changes in Spring Integration 4.1 since version 4.0, + please see . + +
diff --git a/src/reference/docbook/history.xml b/src/reference/docbook/history.xml index e27b46b547..20517965d5 100644 --- a/src/reference/docbook/history.xml +++ b/src/reference/docbook/history.xml @@ -4,6 +4,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> Change History + diff --git a/src/reference/docbook/index.xml b/src/reference/docbook/index.xml index 718034e8fd..dca7fcea06 100644 --- a/src/reference/docbook/index.xml +++ b/src/reference/docbook/index.xml @@ -70,7 +70,7 @@ For those who are already familiar with Spring Integration, this chapter - provides a brief overview of the new features of version 4.0. If you are + provides a brief overview of the new features of version 4.1. If you are interested in the changes and features, that were introduced in earlier versions, please see chapter: diff --git a/src/reference/docbook/preface.xml b/src/reference/docbook/preface.xml index c7415382cf..e58be5ea5e 100644 --- a/src/reference/docbook/preface.xml +++ b/src/reference/docbook/preface.xml @@ -12,13 +12,13 @@
Compatible Java Versions - For Spring Integration 4.0.x, + For Spring Integration 4.1.x, the minimum compatible Java version is Java SE 6. Older versions of Java are not supported. - Spring Integration 4.0.x + Spring Integration 4.1.x is also compatible with Java SE 7 as well as Java SE 8. @@ -27,8 +27,8 @@ Compatible Versions of the Spring Framework Spring Integration - 4.0.x requires - Spring Framework 4.0.3 or + 4.1.x requires + Spring Framework 4.0.5 or later.
diff --git a/src/reference/docbook/whats-new.xml b/src/reference/docbook/whats-new.xml index 521c2f1249..4eb2389d1e 100644 --- a/src/reference/docbook/whats-new.xml +++ b/src/reference/docbook/whats-new.xml @@ -2,382 +2,11 @@ - What's new in Spring Integration 4.0? + What's new in Spring Integration 4.1? This chapter provides an overview of the new features and improvements - that have been introduced with Spring Integration 4.0. If you are interested + that have been introduced with Spring Integration 4.1. If you are interested in more details, please see the Issue Tracker tickets that - were resolved as part of the 4.0 development process. + were resolved as part of the 4.1 development process. - - Please be sure to also see the - Migration Guide for important changes that might affect your applications. - Migration guides for all versions back to 2.1 can be found on the - Wiki. - -
- New Components -
- MQTT Channel Adapters - - The MQTT channel adapters (previously available in the Spring Integration Extensions repository) - are now available as part of the normal Spring Integration distribution. - See - -
-
- @EnableIntegration - - The @EnableIntegration annotation has been added, to permit declaration of - standard Spring Integration beans when using @Configuration classes. - See for more information. - -
-
- @IntegrationComponentScan - - The @IntegrationComponentScan annotation has been added, to permit classpath - scanning for Spring Integration specific components. - See for more information. - -
-
- @EnableMessageHistory - - Message history can now be enabled with the @EnableMessageHistory annotation in a - @Configuration class; in addition the message history settings can be modified - by a JMX MBean. In addition auto-created MessageHandlers for - annotated endpoints (e.g. @ServiceActivator, @Splitter etc.) - now are also trackable by MessageHistory. For more information, see . - -
-
- @MessagingGateway - - Messaging gateway interfaces can now be configured with the @MessagingGateway annotation. - It is an analogue of the <int:gateway/> xml element. - For more information, see . - -
-
- Spring Boot @EnableAutoConfiguration - - As well as the @EnableIntegration annotation mentioned above, a - a hook has been introduced to allow the - Spring Integration infrastructure beans to be configured using Spring Boot's - @EnableAutoConfiguration. - For more information see - Spring Boot - AutoConfigure. - -
-
- @GlobalChannelInterceptor - - As well as the @EnableIntegration annotation mentioned above, - the @GlobalChannelInterceptor annotation has bean introduced. - For more information, see . - -
-
- @IntegrationConverter - - The @IntegrationConverter annotation has bean introduced, - as an analogue of <int:converter/> component. - For more information, see . - -
-
- @EnablePublisher - - The @EnablePublisher annotation has been added, to allow the specification of a - default-publisher-channel for @Publisher annotations. - See for more information. - -
-
- Redis Channel Message Stores - - A new Redis MessageGroupStore, that is optimized for - use when backing a QueueChannel for persistence, is now - provided. - For more information, see . - - - A new Redis ChannelPriorityMessageStore is now - provided. This can be used to retrieve messages by priority. - For more information, see . - -
-
- MongodDB Channel Message Store - - MongoDB support now provides the MongoDbChannelMessageStore - - a channel specific MessageStore implementation. - With priorityEnabled = true, it can be used in - <int:priority-queue>s to achieve priority order polling of - persisted messages. For more information see . - -
-
- @EnableIntegrationMBeanExport - - The IntegrationMBeanExporter can now be enabled with the @EnableIntegrationMBeanExport - annotation in a @Configuration class. For more information, see . - -
-
- ChannelSecurityInterceptorFactoryBean - - Configuration of Spring Security for message channels using @Configuration classes is - now supported by using a ChannelSecurityInterceptorFactoryBean. - For more information, see . - -
-
- Redis Command Gateway - - The Redis support now provides the <outbound-gateway> component - to perform generic Redis commands using the RedisConnection#execute method. - For more information, see . - -
-
- RedisLockRegistry and GemfireLockRegistry - - The RedisLockRegistry and GemfireLockRegistry are now - available supporting global locks visible to multiple application instances/servers. - These can be used with aggregating message handlers across multiple application instances such - that group release will occur on only one instance. - For more information, see , - and . - -
-
- @Poller - - Annotation-based messaging configuration can now have a poller attribute. - This means that methods annotated with (@ServiceActivator, - @Aggregator etc.) can now use an inputChannel that - is a reference to a PollableChannel. - For more information, see . - -
-
- @InboundChannelAdapter and SmartLifecycle for Annotated Endpoints - - The @InboundChannelAdapter method annotation is now available. - It is an analogue of the <int:inbound-channel-adapter> XML component. - In addition, all Messaging Annotations now provide SmartLifecycle options. - For more information, see . - -
-
- Twitter Search Outbound Gateway - - A new twitter endpoint <int-twitter-search-outbound-gateway/> - has been added. Unlike the search inbound adapter which polls using the same search - query each time, the outbound gateway allows on-demand customized queries. - For more information, see . - -
-
- Gemfire Metadata Store - - The GemfireMetadataStore is provided, allowing it to be used, for example, - in a AbstractPersistentAcceptOnceFileListFilter - implementation in a multiple application instance/server environment. - For more information, see , - , and - . - -
-
- @BridgeFrom and @BridgeTo Annotations - - Annotation and Java configuration has introduced @BridgeFrom and - @BridgeTo @Bean method annotations to mark - MessageChannel beans in - @Configuration classes. - For more information, see . - -
-
- Meta Messaging Annotations - - Messaging Annotations (@ServiceActivator, @Router, - @MessagingGateway etc.) can now be configured as meta-annotations for user-defined - Messaging Annotations. In addition the user-defined annotations can have the same attributes - (inputChannel, @Poller, autoStartup etc.). - For more information, see . - -
-
- -
- General Changes -
- Requires Spring Framework 4.0 - - Core messaging abstractions (Message, - MessageChannel etc) have moved to the Spring - Framework spring-messaging module. Users who reference these - classes directly in their code will need to make changes as described in - the first section of the - Migration Guide. - -
-
- Header Type for XPath Header Enricher - - The header-type attribute has been introduced for the header sub-element of the - <int-xml:xpath-header-enricher>. This attribute provides the target type for - the header value to which the result of the XPath expression evaluation will be converted. - For more information see . - -
-
- Object To Json Transformer: Node Result - - The result-type attribute has been introduced for the <int:object-to-json-transformer>. - This attribute provides the target type for the result of object mapping to JSON. - It supports STRING (default) and NODE. - For more information see . - -
-
- JMS Header Mapping - - The DefaultJmsHeaderMapper now maps an incoming JMSPriority header to - the Spring Integration priority header. Previously priority was only - considered for outbound messages. For more information see . - -
-
- JMS Outbound Channel Adapter - - The JMS outbound channel adapter now supports the session-transacted attribute - (default false). Previously, you had to inject a customized JmsTemplate - to use transactions. See . - -
-
- JMS Inbound Channel Adapter - - The JMS inbound channel adapter now supports the session-transacted attribute - (default false). Previously, you had to inject a customized JmsTemplate - to use transactions (the adapter allowed 'transacted' in the acknowledgeMode which was - incorrect, and didn't work; this value is no longer allowed). See - . - -
-
- Datatype Channels - - You can now specify a MessageConverter to be used when converting - (if necessary) payloads to one of the accepted datatypes in a Datatype channel. - For more information see . - -
-
- Simpler Retry Advice Configuration - - Simplified namespace support has been added to configure a - RequestHandlerRetryAdvice. - For more information see . - -
-
- Correlation Endpoint: Time-based Release Strategy - - The mutually exclusive group-timeout and group-timeout-expression - attributes have been added to the <int:aggregator> and <int:resequencer>. - These attributes allow forced completion of a partial MessageGroup, - if the ReleaseStrategy does not release a group and no - further messages arrive within the time specified. - For more information see . - -
-
- Redis Metadata Store - - The RedisMetadataStore now implements ConcurrentMetadataStore, allowing it to be used, for example, - in a AbstractPersistentAcceptOnceFileListFilter - implementation in a multiple application instance/server environment. - For more information, see , - , and - . - -
-
- JdbcChannelMessageStore and PriorityChannel - - The JdbcChannelMessageStore now implements - PriorityCapableChannelMessageStore, allowing it to be used as - a message-store reference for priority-queues. - For more information, see . - -
-
- AMQP Endpoints Delivery Mode - - Spring AMQP, by default, creates persistent messages on the broker. This behavior can be - overridden by setting the amqp_deliveryMode header and/or customizing the - mappers. A convenient default-delivery-mode attribute has now been added - to the adapters to provide easier configuration of this important setting. - For more information, see and - . - -
-
- FTP Timeouts - - The DefaultFtpSessionFactory now exposes the - connectTimeout, defaultTimeout and dataTimeout - properties, avoiding the need to subclass the factory just to set these common - properties. The postProcess* methods are still available for more - advanced configuration. See for more information. - -
-
- Twitter: StatusUpdatingMessageHandler - - The StatusUpdatingMessageHandler (<int-twitter:outbound-channel-adapter>) - now supports the tweet-data-expression attribute to build a - org.springframework.social.twitter.api.TweetData object for updating the - timeline status allowing, for example, attaching an image. - See for more information. - -
-
- JPA Retrieving Gateway: id-expression - - The id-expression attribute has been introduced for - <int-jpa:retrieving-outbound-gateway> to perform - EntityManager.find(Class entityClass, Object primaryKey). - See for more information. - -
-
- TCP Deserialization Events - - When one of the standard deserializers encounters a problem decoding the input stream to - a message, it will now emit a TcpDeserializationExceptionEvent, allowing - applications to examine the data at the point the exception occurred. - See for more information. - -
-
- Messaging Annotations on @Bean Definitions - - Messaging Annotations (@ServiceActivator, @Router, - @InboundChannelAdapter etc.) can now be configured on @Bean - definitions in @Configuration classes. - For more information, see . - -
-