Gary Russell 3080b892d5 Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP ...

Conflicts:
	spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java
	spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java
	spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java
	spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java
	spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java
	spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java

Resolved.

2013-10-30 23:13:27 -04:00

..

local-test-dir

INT-1614 adding @Ignored sanity tests

2010-11-19 13:05:23 -05:00

remote-target-dir

INT-1614 adding @Ignored sanity tests

2010-11-19 13:05:23 -05:00

remote-test-dir

INT-1614 added test for validating FTP copying from remote to local dir

2010-11-20 14:32:47 -05:00

src

Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP

2013-10-30 23:13:27 -04:00

.gitignore

INT-3180 Add s-i-ftp/test to .gitIgnore

2013-10-29 17:05:33 -04:00

.springBeans

INT-1614 added prser test for outbound

2010-11-15 15:22:06 -05:00

log4j.properties

INT-1614 adding @Ignored sanity tests

2010-11-19 13:05:23 -05:00