Gary Russell
a24b9ffa22
Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP
Conflicts:
spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java
spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java
spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java
spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java
spring-integration-file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java
spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java
spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java
spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java
spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptor.java
spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java
spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageGroupStoreTests.java
spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java
spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java
Resolved.
2013-11-25 17:59:51 -05:00
..
2013-11-25 17:59:51 -05:00
2011-08-03 15:16:19 +05:30