Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3418: Prepare 4.1 VERSION

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3418

* Create 4.1 XSD
* Clean up Docs for 4.1
* Prepare WebSocket module
* Add Reactor dependency
* Remove Eclipse and SNV artifacts

Phase #1: prepare

Conflicts:
	gradle.properties
This commit is contained in:
Artem Bilan
2014-05-24 14:41:53 +03:00
parent 697afdae01
commit cedbf6edc2
67 changed files with 526 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@@ -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}-", '')

2
gradle.properties
View File

@@ -1 +1 @@
version=4.0.3.BUILD-SNAPSHOT
version=4.1.0.BUILD-SNAPSHOT

1
settings.gradle
View File

@@ -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'

7
spring-integration-amqp/src/main/resources/META-INF/spring.schemas
View File

@@ -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

13
spring-integration-core/.springBeans
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[3.2.0.201303060654-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

2
spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java
View File

@@ -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();

9
spring-integration-core/src/main/resources/META-INF/spring.schemas
View File

@@ -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

13
spring-integration-event/.springBeans
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.5.1.201011101000-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

8
spring-integration-event/src/main/resources/META-INF/spring.schemas
View File

@@ -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

1
spring-integration-feed/.gitignore vendored
View File

@@ -1 +0,0 @@
/target

8
spring-integration-feed/src/main/resources/META-INF/spring.schemas
View File

@@ -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

14
spring-integration-file/.springBeans
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.9.2.201205070117-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/file/config/config.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

9
spring-integration-file/src/main/resources/META-INF/spring.schemas
View File

@@ -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

14
spring-integration-ftp/.springBeans
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.5.0.201010221000-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

8
spring-integration-ftp/log4j.properties
View File

@@ -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

8
spring-integration-ftp/src/main/resources/META-INF/spring.schemas
View File

@@ -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

1
spring-integration-gemfire/.gitignore vendored
View File

@@ -1 +0,0 @@
*.cfg

16
spring-integration-gemfire/.springBeans
View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.8.0.201110170010-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests-context.xml</config>
<config>src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests-context.xml</config>
<config>src/test/java/org/springframework/integration/gemfire/store/gemfire-queue-context.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

7
spring-integration-gemfire/src/main/resources/META-INF/spring.schemas
View File

@@ -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

13
spring-integration-groovy/.springBeans
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.7.1.201107082359-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

8
spring-integration-groovy/src/main/resources/META-INF/spring.schemas
View File

@@ -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

13
spring-integration-http/.springBeans
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.5.2.201101121000-SR1]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

9
spring-integration-http/src/main/resources/META-INF/spring.schemas
View File

@@ -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

16
spring-integration-ip/.springBeans
View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.7.2.201109122348-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/ip/tcp/connection/SOLingerTests-context.xml</config>
<config>src/test/java/org/springframework/integration/ip/tcp/AutoStartTests-context.xml</config>
<config>src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests-context.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

8
spring-integration-ip/src/main/resources/META-INF/spring.schemas
View File

@@ -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

14
spring-integration-jdbc/.springBeans
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.5.1.201011101000-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayWithPollerTest-context.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

8
spring-integration-jdbc/src/main/resources/META-INF/spring.schemas
View File

@@ -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

15
spring-integration-jms/.springBeans
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.5.2.201101121000-SR1]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests-context.xml</config>
<config>src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests-context.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

9
spring-integration-jms/src/main/resources/META-INF/spring.schemas
View File

@@ -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

14
spring-integration-jmx/.springBeans
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.5.0.201008251000-M3]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests-context.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

8
spring-integration-jmx/src/main/resources/META-INF/spring.schemas
View File

@@ -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

6
spring-integration-jpa/src/main/resources/META-INF/spring.schemas
View File

@@ -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

15
spring-integration-mail/.springBeans
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.5.2.201101121000-SR1]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/mail/config/MailOutboundWithJavamailProperties-context.xml</config>
<config>src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests-context.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

9
spring-integration-mail/src/main/resources/META-INF/spring.schemas
View File

@@ -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

6
spring-integration-mongodb/src/main/resources/META-INF/spring.schemas
View File

@@ -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

4
spring-integration-mqtt/src/main/resources/META-INF/spring.schemas
View File

@@ -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

7
spring-integration-redis/src/main/resources/META-INF/spring.schemas
View File

@@ -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

9
spring-integration-rmi/src/main/resources/META-INF/spring.schemas
View File

@@ -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

13
spring-integration-scripting/.springBeans
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.7.1.201107082359-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

14
spring-integration-scripting/src/main/resources/META-INF/spring.schemas
View File

@@ -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

13
spring-integration-security/.springBeans
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.3.3.201005102200-CI-R3771-B739]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

9
spring-integration-security/src/main/resources/META-INF/spring.schemas
View File

@@ -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

15
spring-integration-sftp/.springBeans
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.6.0.201104111100-PATCH]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests-context.xml</config>
<config>src/test/java/org/springframework/integration/sftp/config/SftpInboundAutostartup-context.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

8
spring-integration-sftp/src/main/resources/META-INF/spring.schemas
View File

@@ -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

9
spring-integration-stream/src/main/resources/META-INF/spring.schemas
View File

@@ -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

5
spring-integration-syslog/src/main/resources/META-INF/spring.schemas
View File

@@ -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

13
spring-integration-test/.springBeans
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.3.3.201005102200-CI-R3771-B739]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

0
spring-integration-test/src/main/resources/.svnignore
View File

8
spring-integration-twitter/src/main/resources/META-INF/spring.schemas
View File

@@ -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

31
spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketNamespaceHandler.java Normal file
View File

@@ -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() {
}
}

4
spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/package-info.java Normal file
View File

@@ -0,0 +1,4 @@
/**
* Contains parser classes for the WebSockets namespace support.
*/
package org.springframework.integration.websocket.config;

1
spring-integration-websocket/src/main/resources/META-INF/spring.handlers Normal file
View File

@@ -0,0 +1 @@
http\://www.springframework.org/schema/integration/websocket=org.springframework.integration.websocket.config.WebSocketNamespaceHandler

2
spring-integration-websocket/src/main/resources/META-INF/spring.schemas Normal file
View File

@@ -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

4
spring-integration-websocket/src/main/resources/META-INF/spring.tooling Normal file
View File

@@ -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

22
spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.springframework.org/schema/integration/websocket"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:integration="http://www.springframework.org/schema/integration"
targetNamespace="http://www.springframework.org/schema/integration/websocket"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
<xsd:import namespace="http://www.springframework.org/schema/tool"/>
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[
Defines the configuration elements for Spring Integration's WebSocket adapters.
]]></xsd:documentation>
</xsd:annotation>
</xsd:schema>

BIN
spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 578 B

9
spring-integration-ws/src/main/resources/META-INF/spring.schemas
View File

@@ -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

13
spring-integration-xml/.springBeans
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.5.0.201008251000-M3]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

9
spring-integration-xml/src/main/resources/META-INF/spring.schemas
View File

@@ -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

14
spring-integration-xmpp/.springBeans
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.5.0.201010221000-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTest-context.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

8
spring-integration-xmpp/src/main/resources/META-INF/spring.schemas
View File

@@ -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

375
src/reference/docbook/changes-3.0-4.0.xml
View File

@@ -2,8 +2,375 @@
<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="migration-3.0-4.0"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Changes between 3.0 and 4.0</title>
<para>
For an overview of the changes in Spring Integration 4.0 since version 3.0,
please see <xref linkend="whats-new"/>.
</para>
<para>
Please be sure to also see the
<ulink url="https://github.com/spring-projects/spring-integration/wiki/Spring-Integration-3.0-to-4.0-Migration-Guide"
>Migration Guide</ulink> for important changes that might affect your applications.
Migration guides for all versions back to <emphasis>2.1</emphasis> can be found on the
<ulink url="https://github.com/spring-projects/spring-integration/wiki">Wiki</ulink>.
</para>
<section id="4.0-new-components">
<title>New Components</title>
<section id="4.0-mqtt">
<title>MQTT Channel Adapters</title>
<para>
The MQTT channel adapters (previously available in the Spring Integration Extensions repository)
are now available as part of the normal Spring Integration distribution.
See <xref linkend="mqtt"/>
</para>
</section>
<section id="4.0-enable-configuration">
<title>@EnableIntegration</title>
<para>
The <code>@EnableIntegration</code> annotation has been added, to permit declaration of
standard Spring Integration beans when using <code>@Configuration</code> classes.
See <xref linkend="enable-integration"/> for more information.
</para>
</section>
<section id="4.0-component-scan">
<title>@IntegrationComponentScan</title>
<para>
The <code>@IntegrationComponentScan</code> annotation has been added, to permit classpath
scanning for Spring Integration specific components.
See <xref linkend="enable-integration"/> for more information.
</para>
</section>
<section id="4.0-message-history">
<title>@EnableMessageHistory</title>
<para>
Message history can now be enabled with the <code>@EnableMessageHistory</code> annotation in a
<code>@Configuration</code> class; in addition the message history settings can be modified
by a JMX MBean. In addition auto-created <interfacename>MessageHandler</interfacename>s for
annotated endpoints (e.g. <classname>@ServiceActivator</classname>, <classname>@Splitter</classname> etc.)
now are also trackable by <code>MessageHistory</code>. For more information, see <xref linkend="message-history"/>.
</para>
</section>
<section id="4.0-messaging-gateway">
<title>@MessagingGateway</title>
<para>
Messaging gateway interfaces can now be configured with the <code>@MessagingGateway</code> annotation.
It is an analogue of the <code>&lt;int:gateway/&gt;</code> xml element.
For more information, see <xref linkend="messaging-gateway-annotation"/>.
</para>
</section>
<section id="4.0-boot">
<title>Spring Boot @EnableAutoConfiguration</title>
<para>
As well as the <code>@EnableIntegration</code> annotation mentioned above, a
a hook has been introduced to allow the
Spring Integration infrastructure beans to be configured using Spring Boot's
<code>@EnableAutoConfiguration</code>.
For more information see
<ulink url="http://docs.spring.io/spring-boot/docs/current/reference/html/using-boot-auto-configuration.html"
>Spring Boot - AutoConfigure</ulink>.
</para>
</section>
<section id="4.0-global-channel-interceptor">
<title>@GlobalChannelInterceptor</title>
<para>
As well as the <code>@EnableIntegration</code> annotation mentioned above,
the <code>@GlobalChannelInterceptor</code> annotation has bean introduced.
For more information, see <xref linkend="enable-integration"/>.
</para>
</section>
<section id="4.0-integration-converter">
<title>@IntegrationConverter</title>
<para>
The <code>@IntegrationConverter</code> annotation has bean introduced,
as an analogue of <code>&lt;int:converter/&gt;</code> component.
For more information, see <xref linkend="enable-integration"/>.
</para>
</section>
<section id="4.0-enable-publisher">
<title>@EnablePublisher</title>
<para>
The <code>@EnablePublisher</code> annotation has been added, to allow the specification of a
<code>default-publisher-channel</code> for <classname>@Publisher</classname> annotations.
See <xref linkend="enable-integration"/> for more information.
</para>
</section>
<section id="4.0-redis-cms">
<title>Redis Channel Message Stores</title>
<para>
A new Redis <interfacename>MessageGroupStore</interfacename>, that is optimized for
use when backing a <classname>QueueChannel</classname> for persistence, is now
provided.
For more information, see <xref linkend="redis-cms"/>.
</para>
<para>
A new Redis <interfacename>ChannelPriorityMessageStore</interfacename> is now
provided. This can be used to retrieve messages by priority.
For more information, see <xref linkend="redis-cms"/>.
</para>
</section>
<section id="4.0-priority-channel-mondodb">
<title>MongodDB Channel Message Store</title>
<para>
MongoDB support now provides the <classname>MongoDbChannelMessageStore</classname> -
a <emphasis>channel</emphasis> specific <interfacename>MessageStore</interfacename> implementation.
With <code>priorityEnabled = true</code>, it can be used in
<code>&lt;int:priority-queue&gt;</code>s to achieve <emphasis>priority</emphasis> order polling of
persisted messages. For more information see <xref linkend="mongodb-priority-channel-message-store"/>.
</para>
</section>
<section id="4.0-MBeanExport-annotation">
<title>@EnableIntegrationMBeanExport</title>
<para>
The <classname>IntegrationMBeanExporter</classname> can now be enabled with the <code>@EnableIntegrationMBeanExport</code>
annotation in a <code>@Configuration</code> class. For more information, see <xref linkend="jmx-mbean-exporter"/>.
</para>
</section>
<section id="4.0-channel-security-interceptor">
<title>ChannelSecurityInterceptorFactoryBean</title>
<para>
Configuration of Spring Security for message channels using <code>@Configuration</code> classes is
now supported by using a <classname>ChannelSecurityInterceptorFactoryBean</classname>.
For more information, see <xref linkend="security"/>.
</para>
</section>
<section id="4.0-redis-outbound-gateway">
<title>Redis Command Gateway</title>
<para>
The Redis support now provides the <code>&lt;outbound-gateway&gt;</code> component
to perform generic Redis commands using the <code>RedisConnection#execute</code> method.
For more information, see <xref linkend="redis-outbound-gateway"/>.
</para>
</section>
<section id="4.0-redis-gemfire-lock-registry">
<title>RedisLockRegistry and GemfireLockRegistry</title>
<para>
The <classname>RedisLockRegistry</classname> and <classname>GemfireLockRegistry</classname> 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 <xref linkend="redis-lock-registry"/>, <xref linkend="gemfire-lock-registry"/>
and <xref linkend="aggregator"/>.
</para>
</section>
<section id="4.0-poller-annotation">
<title>@Poller</title>
<para>
Annotation-based messaging configuration can now have a <code>poller</code> attribute.
This means that methods annotated with (<interfacename>@ServiceActivator</interfacename>,
<interfacename>@Aggregator</interfacename> etc.) can now use an <code>inputChannel</code> that
is a reference to a <interfacename>PollableChannel</interfacename>.
For more information, see <xref linkend="annotations"/>.
</para>
</section>
<section id="4.0-inbound-channel-adapter-annotation">
<title>@InboundChannelAdapter and SmartLifecycle for Annotated Endpoints</title>
<para>
The <interfacename>@InboundChannelAdapter</interfacename> method annotation is now available.
It is an analogue of the <code>&lt;int:inbound-channel-adapter&gt;</code> XML component.
In addition, all Messaging Annotations now provide <interfacename>SmartLifecycle</interfacename> options.
For more information, see <xref linkend="annotations"/>.
</para>
</section>
<section id="4.0-twitter-sog">
<title>Twitter Search Outbound Gateway</title>
<para>
A new twitter endpoint <classname>&lt;int-twitter-search-outbound-gateway/&gt;</classname>
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 <xref linkend="twitter-sog"/>.
</para>
</section>
<section id="4.0-gemfire-metadata">
<title>Gemfire Metadata Store</title>
<para>
The <classname>GemfireMetadataStore</classname> is provided, allowing it to be used, for example,
in a <classname>AbstractPersistentAcceptOnceFileListFilter</classname>
implementation in a multiple application instance/server environment.
For more information, see <xref linkend="metadata-store"/>,
<xref linkend="file-reading"/>, <xref linkend="ftp-inbound"/> and
<xref linkend="sftp-inbound"/>.
</para>
</section>
<section id="4.0-bridge-annotations">
<title>@BridgeFrom and @BridgeTo Annotations</title>
<para>
Annotation and Java configuration has introduced <classname>@BridgeFrom</classname> and
<classname>@BridgeTo</classname> <classname>@Bean</classname> method annotations to mark
<interfacename>MessageChannel</interfacename> beans in
<interfacename>@Configuration</interfacename> classes.
For more information, see <xref linkend="annotations"/>.
</para>
</section>
<section id="4.0-meta-messaging-annotations">
<title>Meta Messaging Annotations</title>
<para>
Messaging Annotations (<classname>@ServiceActivator</classname>, <classname>@Router</classname>,
<classname>@MessagingGateway</classname> etc.) can now be configured as meta-annotations for user-defined
Messaging Annotations. In addition the user-defined annotations can have the same attributes
(<code>inputChannel</code>, <code>@Poller</code>, <code>autoStartup</code> etc.).
For more information, see <xref linkend="annotations"/>.
</para>
</section>
</section>
<section id="4.0-general">
<title>General Changes</title>
<section>
<title>Requires Spring Framework 4.0</title>
<para>
Core messaging abstractions (<interfacename>Message</interfacename>,
<interfacename>MessageChannel</interfacename> etc) have moved to the Spring
Framework <code>spring-messaging</code> module. Users who reference these
classes directly in their code will need to make changes as described in
the first section of the
<ulink url="https://github.com/spring-projects/spring-integration/wiki/Spring-Integration-3.0-to-4.0-Migration-Guide"
>Migration Guide</ulink>.
</para>
</section>
<section id="4.0-xpath-header-enricher-header-type">
<title>Header Type for XPath Header Enricher</title>
<para>
The <code>header-type</code> attribute has been introduced for the <code>header</code> sub-element of the
<code>&lt;int-xml:xpath-header-enricher&gt;</code>. 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 <xref linkend="xml-xpath-header-enricher"/>.
</para>
</section>
<section id="4.0-object-to-json-transformer-result-type">
<title>Object To Json Transformer: Node Result</title>
<para>
The <code>result-type</code> attribute has been introduced for the <code>&lt;int:object-to-json-transformer&gt;</code>.
This attribute provides the target type for the result of object mapping to JSON.
It supports <code>STRING</code> (default) and <code>NODE</code>.
For more information see <xref linkend="transformer-xpath-spel-function"/>.
</para>
</section>
<section id="4.0-jms-header-mapping">
<title>JMS Header Mapping</title>
<para>
The <classname>DefaultJmsHeaderMapper</classname> now maps an incoming <code>JMSPriority</code> header to
the Spring Integration <code>priority</code> header. Previously <code>priority</code> was only
considered for outbound messages. For more information see <xref linkend="jms-header-mapping"/>.
</para>
</section>
<section id="4.0-jms-ob">
<title>JMS Outbound Channel Adapter</title>
<para>
The JMS outbound channel adapter now supports the <code>session-transacted</code> attribute
(default false). Previously, you had to inject a customized <classname>JmsTemplate</classname>
to use transactions. See <xref linkend="jms-outbound-channel-adapter"/>.
</para>
</section>
<section id="4.0-jms-ib">
<title>JMS Inbound Channel Adapter</title>
<para>
The JMS inbound channel adapter now supports the <code>session-transacted</code> attribute
(default false). Previously, you had to inject a customized <classname>JmsTemplate</classname>
to use transactions (the adapter allowed 'transacted' in the acknowledgeMode which was
incorrect, and didn't work; this value is no longer allowed). See
<xref linkend="jms-inbound-channel-adapter"/>.
</para>
</section>
<section id="4.0-datatype-channel">
<title>Datatype Channels</title>
<para>
You can now specify a <interfacename>MessageConverter</interfacename> to be used when converting
(if necessary) payloads to one of the accepted <code>datatype</code>s in a Datatype channel.
For more information see <xref linkend="channel-datatype-channel"/>.
</para>
</section>
<section id="4.0-retry-config">
<title>Simpler Retry Advice Configuration</title>
<para>
Simplified namespace support has been added to configure a
<classname>RequestHandlerRetryAdvice</classname>.
For more information see <xref linkend="retry-config"/>.
</para>
</section>
<section id="4.0-release-strategy-group-timeout">
<title>Correlation Endpoint: Time-based Release Strategy</title>
<para>
The mutually exclusive <code>group-timeout</code> and <code>group-timeout-expression</code>
attributes have been added to the <code>&lt;int:aggregator&gt;</code> and <code>&lt;int:resequencer&gt;</code>.
These attributes allow forced completion of a partial <code>MessageGroup</code>,
if the <interfacename>ReleaseStrategy</interfacename> does not release a group and no
further messages arrive within the time specified.
For more information see <xref linkend="aggregator-config"/>.
</para>
</section>
<section id="4.0-redis-metadata">
<title>Redis Metadata Store</title>
<para>
The <classname>RedisMetadataStore</classname> now implements <interfacename
>ConcurrentMetadataStore</interfacename>, allowing it to be used, for example,
in a <classname>AbstractPersistentAcceptOnceFileListFilter</classname>
implementation in a multiple application instance/server environment.
For more information, see <xref linkend="redis-metadata-store"/>,
<xref linkend="file-reading"/>, <xref linkend="ftp-inbound"/> and
<xref linkend="sftp-inbound"/>.
</para>
</section>
<section id="4.0-jdbc-cs">
<title>JdbcChannelMessageStore and PriorityChannel</title>
<para>
The <classname>JdbcChannelMessageStore</classname> now implements
<interfacename>PriorityCapableChannelMessageStore</interfacename>, allowing it to be used as
a <code>message-store</code> reference for <code>priority-queue</code>s.
For more information, see <xref linkend="jdbc-message-store-channels"/>.
</para>
</section>
<section id="4.0-amqp">
<title>AMQP Endpoints Delivery Mode</title>
<para>
Spring AMQP, by default, creates persistent messages on the broker. This behavior can be
overridden by setting the <code>amqp_deliveryMode</code> header and/or customizing the
mappers. A convenient <code>default-delivery-mode</code> attribute has now been added
to the adapters to provide easier configuration of this important setting.
For more information, see <xref linkend="amqp-outbound-channel-adapter"/> and
<xref linkend="amqp-outbound-gateway"/>.
</para>
</section>
<section id="4.0-ftp">
<title>FTP Timeouts</title>
<para>
The <classname>DefaultFtpSessionFactory</classname> now exposes the
<code>connectTimeout</code>, <code>defaultTimeout</code> and <code>dataTimeout</code>
properties, avoiding the need to subclass the factory just to set these common
properties. The <code>postProcess*</code> methods are still available for more
advanced configuration. See <xref linkend="ftp-session-factory"/> for more information.
</para>
</section>
<section id="4.0-twitter-status-updating">
<title>Twitter: StatusUpdatingMessageHandler</title>
<para>
The <classname>StatusUpdatingMessageHandler</classname> (<code>&lt;int-twitter:outbound-channel-adapter&gt;</code>)
now supports the <code>tweet-data-expression</code> attribute to build a
<classname>org.springframework.social.twitter.api.TweetData</classname> object for updating the
timeline status allowing, for example, attaching an image.
See <xref linkend="outbound-twitter-update"/> for more information.
</para>
</section>
<section id="4.0-jpa-id-expression">
<title>JPA Retrieving Gateway: id-expression</title>
<para>
The <code>id-expression</code> attribute has been introduced for
<code>&lt;int-jpa:retrieving-outbound-gateway&gt;</code> to perform
<code>EntityManager.find(Class entityClass, Object primaryKey)</code>.
See <xref linkend="jpa-retrieving-outbound-gateway"/> for more information.
</para>
</section>
<section id="4.0-tcp-deserializer-events">
<title>TCP Deserialization Events</title>
<para>
When one of the standard deserializers encounters a problem decoding the input stream to
a message, it will now emit a <classname>TcpDeserializationExceptionEvent</classname>, allowing
applications to examine the data at the point the exception occurred.
See <xref linkend="tcp-events"/> for more information.
</para>
</section>
<section id="4.0-bean-messaging-annotations">
<title>Messaging Annotations on @Bean Definitions</title>
<para>
Messaging Annotations (<classname>@ServiceActivator</classname>, <classname>@Router</classname>,
<classname>@InboundChannelAdapter</classname> etc.) can now be configured on <classname>@Bean</classname>
definitions in <interfacename>@Configuration</interfacename> classes.
For more information, see <xref linkend="annotations"/>.
</para>
</section>
</section>
</section>

9
src/reference/docbook/changes-4.0-4.1.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="migration-4.0-4.1"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Changes between 4.0 and 4.1</title>
<para>
For an overview of the changes in Spring Integration 4.1 since version 4.0,
please see <xref linkend="whats-new"/>.
</para>
</section>

1
src/reference/docbook/history.xml
View File

@@ -4,6 +4,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Change History</title>
<xi:include href="./changes-4.0-4.1.xml"/>
<xi:include href="./changes-3.0-4.0.xml"/>
<xi:include href="./changes-2.2-3.0.xml"/>
<xi:include href="./changes-2.1-2.2.xml"/>

2
src/reference/docbook/index.xml
View File

@@ -70,7 +70,7 @@
<partintro id="spring-integration-intro">
<para>
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:

8
src/reference/docbook/preface.xml
View File

@@ -12,13 +12,13 @@
<section id="supported-java-versions">
<title>Compatible Java Versions</title>
<para>
For <emphasis>Spring Integration</emphasis> <emphasis role="strong">4.0.x</emphasis>,
For <emphasis>Spring Integration</emphasis> <emphasis role="strong">4.1.x</emphasis>,
the <emphasis role="strong">minimum</emphasis> compatible Java
version is <emphasis role="strong">Java SE 6</emphasis>.
Older versions of Java are not supported.
</para>
<para>
<emphasis>Spring Integration</emphasis> <emphasis role="strong">4.0.x</emphasis>
<emphasis>Spring Integration</emphasis> <emphasis role="strong">4.1.x</emphasis>
is also compatible with <emphasis role="strong">Java SE 7</emphasis> as well
as <emphasis role="strong">Java SE 8</emphasis>.
</para>
@@ -27,8 +27,8 @@
<title>Compatible Versions of the Spring Framework</title>
<para>
<emphasis>Spring Integration</emphasis>
<emphasis role="strong">4.0.x</emphasis> requires
<emphasis>Spring Framework</emphasis> <emphasis role="strong">4.0.3</emphasis> or
<emphasis role="strong">4.1.x</emphasis> requires
<emphasis>Spring Framework</emphasis> <emphasis role="strong">4.0.5</emphasis> or
later.
</para>
</section>

377
src/reference/docbook/whats-new.xml
View File

@@ -2,382 +2,11 @@
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="whats-new"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>What's new in Spring Integration 4.0?</title>
<title>What's new in Spring Integration 4.1?</title>
<para>
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.
</para>
<para>
Please be sure to also see the
<ulink url="https://github.com/spring-projects/spring-integration/wiki/Spring-Integration-3.0-to-4.0-Migration-Guide"
>Migration Guide</ulink> for important changes that might affect your applications.
Migration guides for all versions back to <emphasis>2.1</emphasis> can be found on the
<ulink url="https://github.com/spring-projects/spring-integration/wiki">Wiki</ulink>.
</para>
<section id="4.0-new-components">
<title>New Components</title>
<section id="4.0-mqtt">
<title>MQTT Channel Adapters</title>
<para>
The MQTT channel adapters (previously available in the Spring Integration Extensions repository)
are now available as part of the normal Spring Integration distribution.
See <xref linkend="mqtt"/>
</para>
</section>
<section id="4.0-enable-configuration">
<title>@EnableIntegration</title>
<para>
The <code>@EnableIntegration</code> annotation has been added, to permit declaration of
standard Spring Integration beans when using <code>@Configuration</code> classes.
See <xref linkend="enable-integration"/> for more information.
</para>
</section>
<section id="4.0-component-scan">
<title>@IntegrationComponentScan</title>
<para>
The <code>@IntegrationComponentScan</code> annotation has been added, to permit classpath
scanning for Spring Integration specific components.
See <xref linkend="enable-integration"/> for more information.
</para>
</section>
<section id="4.0-message-history">
<title>@EnableMessageHistory</title>
<para>
Message history can now be enabled with the <code>@EnableMessageHistory</code> annotation in a
<code>@Configuration</code> class; in addition the message history settings can be modified
by a JMX MBean. In addition auto-created <interfacename>MessageHandler</interfacename>s for
annotated endpoints (e.g. <classname>@ServiceActivator</classname>, <classname>@Splitter</classname> etc.)
now are also trackable by <code>MessageHistory</code>. For more information, see <xref linkend="message-history"/>.
</para>
</section>
<section id="4.0-messaging-gateway">
<title>@MessagingGateway</title>
<para>
Messaging gateway interfaces can now be configured with the <code>@MessagingGateway</code> annotation.
It is an analogue of the <code>&lt;int:gateway/&gt;</code> xml element.
For more information, see <xref linkend="messaging-gateway-annotation"/>.
</para>
</section>
<section id="4.0-boot">
<title>Spring Boot @EnableAutoConfiguration</title>
<para>
As well as the <code>@EnableIntegration</code> annotation mentioned above, a
a hook has been introduced to allow the
Spring Integration infrastructure beans to be configured using Spring Boot's
<code>@EnableAutoConfiguration</code>.
For more information see
<ulink url="http://docs.spring.io/spring-boot/docs/current/reference/html/using-boot-auto-configuration.html"
>Spring Boot - AutoConfigure</ulink>.
</para>
</section>
<section id="4.0-global-channel-interceptor">
<title>@GlobalChannelInterceptor</title>
<para>
As well as the <code>@EnableIntegration</code> annotation mentioned above,
the <code>@GlobalChannelInterceptor</code> annotation has bean introduced.
For more information, see <xref linkend="enable-integration"/>.
</para>
</section>
<section id="4.0-integration-converter">
<title>@IntegrationConverter</title>
<para>
The <code>@IntegrationConverter</code> annotation has bean introduced,
as an analogue of <code>&lt;int:converter/&gt;</code> component.
For more information, see <xref linkend="enable-integration"/>.
</para>
</section>
<section id="4.0-enable-publisher">
<title>@EnablePublisher</title>
<para>
The <code>@EnablePublisher</code> annotation has been added, to allow the specification of a
<code>default-publisher-channel</code> for <classname>@Publisher</classname> annotations.
See <xref linkend="enable-integration"/> for more information.
</para>
</section>
<section id="4.0-redis-cms">
<title>Redis Channel Message Stores</title>
<para>
A new Redis <interfacename>MessageGroupStore</interfacename>, that is optimized for
use when backing a <classname>QueueChannel</classname> for persistence, is now
provided.
For more information, see <xref linkend="redis-cms"/>.
</para>
<para>
A new Redis <interfacename>ChannelPriorityMessageStore</interfacename> is now
provided. This can be used to retrieve messages by priority.
For more information, see <xref linkend="redis-cms"/>.
</para>
</section>
<section id="4.0-priority-channel-mondodb">
<title>MongodDB Channel Message Store</title>
<para>
MongoDB support now provides the <classname>MongoDbChannelMessageStore</classname> -
a <emphasis>channel</emphasis> specific <interfacename>MessageStore</interfacename> implementation.
With <code>priorityEnabled = true</code>, it can be used in
<code>&lt;int:priority-queue&gt;</code>s to achieve <emphasis>priority</emphasis> order polling of
persisted messages. For more information see <xref linkend="mongodb-priority-channel-message-store"/>.
</para>
</section>
<section id="4.0-MBeanExport-annotation">
<title>@EnableIntegrationMBeanExport</title>
<para>
The <classname>IntegrationMBeanExporter</classname> can now be enabled with the <code>@EnableIntegrationMBeanExport</code>
annotation in a <code>@Configuration</code> class. For more information, see <xref linkend="jmx-mbean-exporter"/>.
</para>
</section>
<section id="4.0-channel-security-interceptor">
<title>ChannelSecurityInterceptorFactoryBean</title>
<para>
Configuration of Spring Security for message channels using <code>@Configuration</code> classes is
now supported by using a <classname>ChannelSecurityInterceptorFactoryBean</classname>.
For more information, see <xref linkend="security"/>.
</para>
</section>
<section id="4.0-redis-outbound-gateway">
<title>Redis Command Gateway</title>
<para>
The Redis support now provides the <code>&lt;outbound-gateway&gt;</code> component
to perform generic Redis commands using the <code>RedisConnection#execute</code> method.
For more information, see <xref linkend="redis-outbound-gateway"/>.
</para>
</section>
<section id="4.0-redis-gemfire-lock-registry">
<title>RedisLockRegistry and GemfireLockRegistry</title>
<para>
The <classname>RedisLockRegistry</classname> and <classname>GemfireLockRegistry</classname> 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 <xref linkend="redis-lock-registry"/>, <xref linkend="gemfire-lock-registry"/>
and <xref linkend="aggregator"/>.
</para>
</section>
<section id="4.0-poller-annotation">
<title>@Poller</title>
<para>
Annotation-based messaging configuration can now have a <code>poller</code> attribute.
This means that methods annotated with (<interfacename>@ServiceActivator</interfacename>,
<interfacename>@Aggregator</interfacename> etc.) can now use an <code>inputChannel</code> that
is a reference to a <interfacename>PollableChannel</interfacename>.
For more information, see <xref linkend="annotations"/>.
</para>
</section>
<section id="4.0-inbound-channel-adapter-annotation">
<title>@InboundChannelAdapter and SmartLifecycle for Annotated Endpoints</title>
<para>
The <interfacename>@InboundChannelAdapter</interfacename> method annotation is now available.
It is an analogue of the <code>&lt;int:inbound-channel-adapter&gt;</code> XML component.
In addition, all Messaging Annotations now provide <interfacename>SmartLifecycle</interfacename> options.
For more information, see <xref linkend="annotations"/>.
</para>
</section>
<section id="4.0-twitter-sog">
<title>Twitter Search Outbound Gateway</title>
<para>
A new twitter endpoint <classname>&lt;int-twitter-search-outbound-gateway/&gt;</classname>
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 <xref linkend="twitter-sog"/>.
</para>
</section>
<section id="4.0-gemfire-metadata">
<title>Gemfire Metadata Store</title>
<para>
The <classname>GemfireMetadataStore</classname> is provided, allowing it to be used, for example,
in a <classname>AbstractPersistentAcceptOnceFileListFilter</classname>
implementation in a multiple application instance/server environment.
For more information, see <xref linkend="metadata-store"/>,
<xref linkend="file-reading"/>, <xref linkend="ftp-inbound"/> and
<xref linkend="sftp-inbound"/>.
</para>
</section>
<section id="4.0-bridge-annotations">
<title>@BridgeFrom and @BridgeTo Annotations</title>
<para>
Annotation and Java configuration has introduced <classname>@BridgeFrom</classname> and
<classname>@BridgeTo</classname> <classname>@Bean</classname> method annotations to mark
<interfacename>MessageChannel</interfacename> beans in
<interfacename>@Configuration</interfacename> classes.
For more information, see <xref linkend="annotations"/>.
</para>
</section>
<section id="4.0-meta-messaging-annotations">
<title>Meta Messaging Annotations</title>
<para>
Messaging Annotations (<classname>@ServiceActivator</classname>, <classname>@Router</classname>,
<classname>@MessagingGateway</classname> etc.) can now be configured as meta-annotations for user-defined
Messaging Annotations. In addition the user-defined annotations can have the same attributes
(<code>inputChannel</code>, <code>@Poller</code>, <code>autoStartup</code> etc.).
For more information, see <xref linkend="annotations"/>.
</para>
</section>
</section>
<section id="4.0-general">
<title>General Changes</title>
<section>
<title>Requires Spring Framework 4.0</title>
<para>
Core messaging abstractions (<interfacename>Message</interfacename>,
<interfacename>MessageChannel</interfacename> etc) have moved to the Spring
Framework <code>spring-messaging</code> module. Users who reference these
classes directly in their code will need to make changes as described in
the first section of the
<ulink url="https://github.com/spring-projects/spring-integration/wiki/Spring-Integration-3.0-to-4.0-Migration-Guide"
>Migration Guide</ulink>.
</para>
</section>
<section id="4.0-xpath-header-enricher-header-type">
<title>Header Type for XPath Header Enricher</title>
<para>
The <code>header-type</code> attribute has been introduced for the <code>header</code> sub-element of the
<code>&lt;int-xml:xpath-header-enricher&gt;</code>. 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 <xref linkend="xml-xpath-header-enricher"/>.
</para>
</section>
<section id="4.0-object-to-json-transformer-result-type">
<title>Object To Json Transformer: Node Result</title>
<para>
The <code>result-type</code> attribute has been introduced for the <code>&lt;int:object-to-json-transformer&gt;</code>.
This attribute provides the target type for the result of object mapping to JSON.
It supports <code>STRING</code> (default) and <code>NODE</code>.
For more information see <xref linkend="transformer-xpath-spel-function"/>.
</para>
</section>
<section id="4.0-jms-header-mapping">
<title>JMS Header Mapping</title>
<para>
The <classname>DefaultJmsHeaderMapper</classname> now maps an incoming <code>JMSPriority</code> header to
the Spring Integration <code>priority</code> header. Previously <code>priority</code> was only
considered for outbound messages. For more information see <xref linkend="jms-header-mapping"/>.
</para>
</section>
<section id="4.0-jms-ob">
<title>JMS Outbound Channel Adapter</title>
<para>
The JMS outbound channel adapter now supports the <code>session-transacted</code> attribute
(default false). Previously, you had to inject a customized <classname>JmsTemplate</classname>
to use transactions. See <xref linkend="jms-outbound-channel-adapter"/>.
</para>
</section>
<section id="4.0-jms-ib">
<title>JMS Inbound Channel Adapter</title>
<para>
The JMS inbound channel adapter now supports the <code>session-transacted</code> attribute
(default false). Previously, you had to inject a customized <classname>JmsTemplate</classname>
to use transactions (the adapter allowed 'transacted' in the acknowledgeMode which was
incorrect, and didn't work; this value is no longer allowed). See
<xref linkend="jms-inbound-channel-adapter"/>.
</para>
</section>
<section id="4.0-datatype-channel">
<title>Datatype Channels</title>
<para>
You can now specify a <interfacename>MessageConverter</interfacename> to be used when converting
(if necessary) payloads to one of the accepted <code>datatype</code>s in a Datatype channel.
For more information see <xref linkend="channel-datatype-channel"/>.
</para>
</section>
<section id="4.0-retry-config">
<title>Simpler Retry Advice Configuration</title>
<para>
Simplified namespace support has been added to configure a
<classname>RequestHandlerRetryAdvice</classname>.
For more information see <xref linkend="retry-config"/>.
</para>
</section>
<section id="4.0-release-strategy-group-timeout">
<title>Correlation Endpoint: Time-based Release Strategy</title>
<para>
The mutually exclusive <code>group-timeout</code> and <code>group-timeout-expression</code>
attributes have been added to the <code>&lt;int:aggregator&gt;</code> and <code>&lt;int:resequencer&gt;</code>.
These attributes allow forced completion of a partial <code>MessageGroup</code>,
if the <interfacename>ReleaseStrategy</interfacename> does not release a group and no
further messages arrive within the time specified.
For more information see <xref linkend="aggregator-config"/>.
</para>
</section>
<section id="4.0-redis-metadata">
<title>Redis Metadata Store</title>
<para>
The <classname>RedisMetadataStore</classname> now implements <interfacename
>ConcurrentMetadataStore</interfacename>, allowing it to be used, for example,
in a <classname>AbstractPersistentAcceptOnceFileListFilter</classname>
implementation in a multiple application instance/server environment.
For more information, see <xref linkend="redis-metadata-store"/>,
<xref linkend="file-reading"/>, <xref linkend="ftp-inbound"/> and
<xref linkend="sftp-inbound"/>.
</para>
</section>
<section id="4.0-jdbc-cs">
<title>JdbcChannelMessageStore and PriorityChannel</title>
<para>
The <classname>JdbcChannelMessageStore</classname> now implements
<interfacename>PriorityCapableChannelMessageStore</interfacename>, allowing it to be used as
a <code>message-store</code> reference for <code>priority-queue</code>s.
For more information, see <xref linkend="jdbc-message-store-channels"/>.
</para>
</section>
<section id="4.0-amqp">
<title>AMQP Endpoints Delivery Mode</title>
<para>
Spring AMQP, by default, creates persistent messages on the broker. This behavior can be
overridden by setting the <code>amqp_deliveryMode</code> header and/or customizing the
mappers. A convenient <code>default-delivery-mode</code> attribute has now been added
to the adapters to provide easier configuration of this important setting.
For more information, see <xref linkend="amqp-outbound-channel-adapter"/> and
<xref linkend="amqp-outbound-gateway"/>.
</para>
</section>
<section id="4.0-ftp">
<title>FTP Timeouts</title>
<para>
The <classname>DefaultFtpSessionFactory</classname> now exposes the
<code>connectTimeout</code>, <code>defaultTimeout</code> and <code>dataTimeout</code>
properties, avoiding the need to subclass the factory just to set these common
properties. The <code>postProcess*</code> methods are still available for more
advanced configuration. See <xref linkend="ftp-session-factory"/> for more information.
</para>
</section>
<section id="4.0-twitter-status-updating">
<title>Twitter: StatusUpdatingMessageHandler</title>
<para>
The <classname>StatusUpdatingMessageHandler</classname> (<code>&lt;int-twitter:outbound-channel-adapter&gt;</code>)
now supports the <code>tweet-data-expression</code> attribute to build a
<classname>org.springframework.social.twitter.api.TweetData</classname> object for updating the
timeline status allowing, for example, attaching an image.
See <xref linkend="outbound-twitter-update"/> for more information.
</para>
</section>
<section id="4.0-jpa-id-expression">
<title>JPA Retrieving Gateway: id-expression</title>
<para>
The <code>id-expression</code> attribute has been introduced for
<code>&lt;int-jpa:retrieving-outbound-gateway&gt;</code> to perform
<code>EntityManager.find(Class entityClass, Object primaryKey)</code>.
See <xref linkend="jpa-retrieving-outbound-gateway"/> for more information.
</para>
</section>
<section id="4.0-tcp-deserializer-events">
<title>TCP Deserialization Events</title>
<para>
When one of the standard deserializers encounters a problem decoding the input stream to
a message, it will now emit a <classname>TcpDeserializationExceptionEvent</classname>, allowing
applications to examine the data at the point the exception occurred.
See <xref linkend="tcp-events"/> for more information.
</para>
</section>
<section id="4.0-bean-messaging-annotations">
<title>Messaging Annotations on @Bean Definitions</title>
<para>
Messaging Annotations (<classname>@ServiceActivator</classname>, <classname>@Router</classname>,
<classname>@InboundChannelAdapter</classname> etc.) can now be configured on <classname>@Bean</classname>
definitions in <interfacename>@Configuration</interfacename> classes.
For more information, see <xref linkend="annotations"/>.
</para>
</section>
</section>
</chapter>