Commit Graph

7448 Commits

Author SHA1 Message Date
Gunnar Hillert
7d6b5850f5 Merge pull request #790 from garyrussell/INT-2982a
* garyrussell-INT-2982a:
  INT-2982 Fix Hard-Coded Ports in Syslog Tests
2013-04-26 00:23:04 -04:00
Gary Russell
920190931e INT-2982 Fix Hard-Coded Ports in Syslog Tests
Use the port finder to find an available port; using
hard-coded ports can cause issues with concurrent builds.

One test found a port in the XML but was still hard-coded
in the test itself rather than retrieving the port from
the adapter.

Also, stop the adapters when tests complete.
2013-04-26 00:22:08 -04:00
Gary Russell
5e7aa59f73 Merge pull request #781 from ghillert/INT-2980 2013-04-24 11:23:43 -04:00
Gunnar Hillert
88165c8881 INT-2980 Jdbc Message Store: Polling Wrong Message
* Add Join to JDBC Query
* Add MySql-specific tests
* INT-2987 - MessageStore MySQL - Support Fractional Seconds
  - Update MySql Connector version to 5.1.24
  - Add DDL scripts for MySql versions 5.6.4 and higher

INT-2980 - Check also for Regions

* Add test

INT-2980/INT-2987 - Add Documentation

INT-2980 - Doc: Add info to What's New Section
2013-04-24 11:21:21 -04:00
Gunnar Hillert
749896b812 Merge pull request #789 from garyrussell/INT-2892
* garyrussell-INT-2892:
  INT-2892 Add 'local-filter' to (S)FTP Adapters
2013-04-24 00:13:15 -04:00
Gary Russell
14a7953ff6 INT-2892 Add 'local-filter' to (S)FTP Adapters
Allow the replacement of the default AcceptOnceFileListFilter.
2013-04-24 00:11:28 -04:00
Gunnar Hillert
e6753efd50 Merge pull request #780 from garyrussell/INT-2982
* garyrussell-INT-2982:
  INT-2982 Add Syslog Inbound Channel Adapter
2013-04-23 23:39:07 -04:00
Gary Russell
7908655883 INT-2982 Add Syslog Inbound Channel Adapter
* Supports UDP/TCP syslog messages.
* See docbook patch for more information.

For reference see: https://jira.springsource.org/browse/INT-2982
2013-04-23 23:36:36 -04:00
Gunnar Hillert
2c5b9eb977 Merge pull request #788 from garyrussell/INT-2996
* garyrussell-INT-2996:
  INT-2996 Fix Class and Package Cycles
2013-04-19 09:56:41 -04:00
Gary Russell
00cb16ec21 INT-2996 Fix Class and Package Cycles
INT-2996 Fix Package Cycle

Move interface ...store.MetadataStore to ...store.metadata.

INT-2996 Fix Class Tangle

TcpConnectionEvent incorrectly referenced the
concrete TcpConnectionSupport instead of TcpConnection.
2013-04-16 19:10:48 -04:00
Gunnar Hillert
b50410923f Merge pull request #779 from garyrussell/INT-2981
* garyrussell-INT-2981:
  INT-2981 - Add Rename (mv) to (S)FTP Gateway
2013-04-16 16:32:35 -04:00
Gary Russell
c224d445ac INT-2981 - Add Rename (mv) to (S)FTP Gateway
* (S)FTP Change Commands, Options to Enums
* INT-2981 Add Support For 'mv' To File/Remote/GW
* INT-2981 (S)FTP Namespace Support and Docs
* INT-2981 Create Remote Dirs if Needed
* INT-2981 Add 'mv' Command to What's New
* INT-2981 Polishing - PR Comments
* Add javadocs to enums.
* Polish schemas to use an enumerated type for available gateway commands
2013-04-16 16:26:29 -04:00
Gary Russell
2e2986d354 Merge pull request #787 from ghillert/INT-2992 2013-04-16 16:19:35 -04:00
Gunnar Hillert
8d05c27a94 INT-2992 - Upgrade Derby Test Dependencies
* Upgrade Derby test dependencies to 10.9.1.0
* Due to test-failures switch from using the embedded-database namespace support for Derby to explicitly configured DataSource beans (DriverManagerDataSource)

For more details see: https://jira.springsource.org/browse/INT-2992
2013-04-16 14:24:33 -04:00
Gary Russell
768d7ff713 Merge pull request #786 from ghillert/INT-2964 2013-04-15 17:17:32 -04:00
Gunnar Hillert
05062aa0b2 INT-2964 Various JavaDoc Fixes
INT-2964 - JavaDoc: <emphasis> should be <em>

INT-2964 - JavaDoc: <p/> should be <p>

INT-2964 - JavaDoc polishing

* <li></li> should be wrapped in <ul></ul>
* wrap code snippets in {@code myCode()}
* change <code>false</false> to <code>false</code>

INT-2964 - Polish - Fix more JavaDoc errors

* Mockito-all dependency causes JavaDoc error. Change dependency to Mockito-Core.
2013-04-15 17:11:38 -04:00
Gary Russell
4c348d3785 Merge pull request #785 from ghillert/INT-2985 2013-04-15 15:59:15 -04:00
Gunnar Hillert
51149184e8 INT-2985 - Upgrade to Gradle 1.5 2013-04-11 16:02:24 -04:00
Gunnar Hillert
7e8035acd2 Merge pull request #783 from sobychacko/INT-2926
* sobychacko-INT-2926:
  INT-2926:Remove deprecation warnings in CacheServerProcess in the gemfire module
2013-04-11 12:19:12 -04:00
Soby Chacko
b3e6630ced INT-2926:Remove deprecation warnings in CacheServerProcess in the gemfire module 2013-04-11 12:13:17 -04:00
Gunnar Hillert
fe7c311f9c Merge pull request #782 from garyrussell/INT-2989
* garyrussell-INT-2989:
  INT-2989 Increase JMS Test Timeouts
2013-04-10 17:46:36 -04:00
Gary Russell
52db954eff INT-2989 Increase JMS Test Timeouts
The default 5 second timeout is insufficient in some cases
for the larger volume tests. In most cases, increase to
10 seconds; in some cases to 30 seconds.

Also, add code to keep the ActiveMQ VMTransport running for
the entire test class (by keeping a connection open).

Avoids cycling the broker, which can cause other issues.

Also close the context in a finally block in PipeLineJmsTests.

Clean up some whitespace violations in config files.

This, together with the try/finally block makes the commit
look bigger than it really is; suggest using 'git log -p -b'
to review.

Increase overall test timeout for PipelineNamedReplyQueuesJmsTests.
2013-04-10 17:38:48 -04:00
Gary Russell
3e5a3a2b3d Merge pull request #769 from artembilan/INT-2720 2013-04-10 10:41:57 -04:00
Artem Bilan
6b7ae6ceed INT-2720: UriTemplate Support for S-WS Transports
Remove deprecation in the WS module

JIRA: https://jira.springsource.org/browse/INT-2720
      https://jira.springsource.org/browse/INT-2530

INT-2720: Polishing after rebase

INT-2720: Add a note to the Reference Manual

Polishing <authorgroup> to avoid extra whitespace before name

INT-2720: Pr comments & polishing

* Revert removed public API
* Revert tabs in What's new
* Change real URL to fake to allow for tests to work off-line
* Add smackx dependency to avoid error messages in logs
2013-04-10 09:54:34 -04:00
Gary Russell
7d99a9a07a Merge pull request #776 from artembilan/INT-2971 2013-04-09 10:02:31 -04:00
Artem Bilan
4473e565a5 INT-2971: AMPQ 'header-mapper' XSD Polishing
* Change expected type from the `HeaderMapper` to the `AmqpHeaderMapper`
* Add 'header-mapper' mutually exclusivity failing tests
* Change AMQP doc to reference `AmqpHeaderMapper` not `HeaderMapper`

JIRA: https://jira.springsource.org/browse/INT-2971

INT-2971 Polishing

Polish schema docs; add info about STANDARD_*_HEADERS.
2013-04-09 10:00:11 -04:00
Gary Russell
77c93bc6e5 Merge pull request #737 from ghillert/INT-2916 2013-04-04 13:43:14 -04:00
Gunnar Hillert
0271acaf4c INT-2916 - Upgrade to JUnit 4.11 in support of JDK7
For reference see: https://jira.springsource.org/browse/INT-2916

Changes:

* INT-2919 - Upgrade Spring Data Gemfire to 1.2.2.RELEASE
* Exclude Hamcrest transitive dependency from JUnit (as already explicitly declared)
* Set sourceCompatibility in build.gradle to 1.6
* Set targetCompatibility in build.gradle to 1.6
* Upgrade Hamcrest to 1.3 and fix deprications
  - Corematcher is(*class) change to is(instanceOf(*class))
  - Change org.junit.internal.matchers.TypeSafeMatcher to org.hamcrest.TypeSafeMatcher
  - Change import org.junit.matchers.JUnitMatchers.containsString to org.hamcrest.CoreMatchers.containsString
  - Change import org.junit.matchers.JUnitMatchers.both to org.hamcrest.CoreMatchers.both
  - Change import org.junit.matchers.JUnitMatchers.containsString to org.hamcrest.CoreMatchers.containsString
* Fix JUnit deprecations
  - changed junit.framework.Assert to org.junit.Assert
* Add few missing licenses headers to tests
* Marked several test classes with: @DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
  - SplitterIntegrationTests
  - GatewayInvokingMessageHandlerTests
  - FileToChannelIntegrationTests
  - FileInboundChannelAdapterWithRecursiveDirectoryTests
  - JdbcMessageStoreChannelTests
  - ChatMessageInboundChannelAdapterParserTests
* 3 Tests ignored (Still needs to be addressed):
  - testOperationOnPrototypeBean
  - testFailOperationWithCustomScope
  - testOperationOfControlBus
* Update SQL script (test-failure):
  - spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/outboundSchema.sql
  - add drop table statements
  - add ignore-failures="DROPS" to "jdbcOutboundChannelAdapterCommonConfig.xml"

INT-2916 - Code Review Changes

INT-2916 - Fix ignored Tests

Fix 3 previously ignored tests in *GroovyControlBusTests*:

* testOperationOnPrototypeBean
* testFailOperationWithCustomScope
* testOperationOfControlBus

INT-2916 - CI Build Testing

INT-2963 - Remove JDK7 Compilation Warnings

* Upgrade Mockito to 1.9.5
* Fix failing SubscribableJmsChannelTests

INT-2916 - Standardize Hamcrest assertions
Ensure Hamcrest assertions are standardized to: is(instanceOf(...))
2013-04-04 13:40:46 -04:00
Gunnar Hillert
3c98b371fa Merge pull request #754 from garyrussell/INT-2939
* garyrussell-INT-2939:
  INT-2939 Polishing
  INT-2939 LoggingHandler Improvements
2013-04-03 00:14:03 -04:00
Gary Russell
4818d9a722 INT-2939 Polishing
Add assert for non-null Level.
2013-04-03 00:11:17 -04:00
Gary Russell
d54a88f528 INT-2939 LoggingHandler Improvements
- Don't evaluate expression if the log level is not enabled
- Add mutually exclusive assertions (already protected by the parser
  but not for programmatic configuration).

INT-2944 Document <logging-channel-adapter/>

Add reference sub-chapter.

INT-2939 Polishing - PR Comments

- remove unnecessary cast.
- add setter for level changes.

Polishing

* Change setter to use enum.
* Add getter for current level.
* Rename method to 'createLogMessage'.
2013-04-03 00:11:17 -04:00
Gunnar Hillert
93211942cf Merge pull request #777 from garyrussell/INT-2970
* garyrussell-INT-2970:
  INT-2970 Update to Spring-AMQP 1.2.0.M1
2013-04-02 18:08:25 -04:00
Gary Russell
4449595520 INT-2970 Update to Spring-AMQP 1.2.0.M1
Add deprecated constants for message properties no
longer used by Spring-AMQP 1.2 (retain to provide
compatibility with 1.1.x).
2013-04-01 13:08:45 -04:00
Gunnar Hillert
110957f975 Merge pull request #775 from garyrussell/INT-2968
* garyrussell-INT-2968:
  INT-2968 SFTP - Update JSch to 1.49
2013-03-27 23:31:04 -04:00
Gary Russell
3cce459335 INT-2968 SFTP - Update JSch to 1.49
Ran SFTP samples to verify.
2013-03-27 23:29:44 -04:00
Mark Fisher
ea68746665 Merge pull request #773 from garyrussell/INT-2954
# By Gary Russell
* INT-2954:
  INT-2954 (S)FTP Fix AutoCreate Top Level Dir
2013-03-27 17:44:00 -04:00
Gary Russell
274813e04c INT-2954 (S)FTP Fix AutoCreate Top Level Dir
When autocreateDirectory is true, and the top level directory
did not exist, the mkdirs failed because the adapter tried
to create a directory name with a zero length string.

This caused an 'String index out of range: 0' exception in
SFTP.

Stop iteration when 'pathSegment' is zero length.
2013-03-27 17:39:22 -04:00
Mark Fisher
dfe8d07eea Merge pull request #761 from garyrussell/INT-2955
* INT-2955: Fix Collection/Map Conversion
2013-03-27 17:31:12 -04:00
Gary Russell
7ab1361231 INT-2955 Fix Collection/Map Conversion
The fix for INT-2650 (to avoid unnecessary array copying) was
too general in that it also prevented types in collections and
maps from being converted.

Add tests to illustrate that such payloads are not converted.

Change code to only short circuit the conversion process if
the payload is a primitive array.

An existing test ensures that arrays are not copied.

Add more tests to complete coverage - discovered another
bug - the early exit after using a property editor to convert
to a String was never taken - it was testing against the
Class of the TypeConverter instead of the Type. If the
target type is a String, we don't need to perform
conversion after the property editor has done its
conversion.

Fix MessageHistory test (was testing MessageHeaders).
2013-03-27 17:03:33 -04:00
Gunnar Hillert
e003891040 Merge pull request #772 from garyrussell/INT-2959
* garyrussell-INT-2959:
  INT-2959 Correct Schema GW reply-timeout Doc.
2013-03-26 23:50:57 -04:00
Gary Russell
b500ef397b INT-2959 Correct Schema GW reply-timeout Doc.
Incorrectly indicated that an exception is thrown when
the gateway times out.
2013-03-26 23:47:52 -04:00
Gary Russell
e8333ae737 Fix Typo in Reference
s/Adivce/Advice/
2013-03-26 11:48:35 -04:00
Gary Russell
be4416c9bf Merge pull request #767 from ghillert/INT-2960 2013-03-14 15:50:07 -04:00
Gunnar Hillert
26e41c8858 INT-2960 - Remove deprecated 'xpath-selector'
For reference see: https://jira.springsource.org/browse/INT-2960

* Remove 'xpath-selector' from XML Schema
* Remove parser class
* Remove tests
* Remove respective reference documentation
2013-03-14 15:48:20 -04:00
Gunnar Hillert
cd7e0576ed Merge pull request #759 from sobychacko/INT-2531
* sobychacko-INT-2531:
  INT-2531: Remove deprecations in XML Adapter after upgrade to Spring 3.1.1
2013-03-14 13:49:35 -04:00
Soby Chacko
d43bbc8eda INT-2531: Remove deprecations in XML Adapter after upgrade to Spring 3.1.1
* BeanDefinitionParserDelegate constructor now prefers an Environment. Circumvent this
preference by directly getting BeanDefinitionParserDelegate from the associated ParserContext
2013-03-14 13:47:06 -04:00
Gunnar Hillert
0fc21de170 Merge pull request #765 from garyrussell/INT-2957
* garyrussell-INT-2957:
  INT-2957 Remove Unnecessary AspectJ Dependencies
2013-03-14 10:54:19 -04:00
Gary Russell
c9fc15892a INT-2957 Remove Unnecessary AspectJ Dependencies
Core, JDBC, JMX, JPA each had dependencies for both
weaver and rt jars. weaver is a superset of rt.

Remove dependencies on the rt jar.

Further JDBC, JPA have no dependencies on AspectJ.

Finally, the JMX dependency was compile, when only
testCompile is needed.
2013-03-14 10:08:34 -04:00
Gary Russell
a3ff5bc2e7 Merge pull request #764 from artembilan/INT-2958 2013-03-13 12:06:01 -04:00
Artem Bilan
6ae61a3345 INT-2958: XSD: move 'charset' from common attrs
`charset` for `<object-to-string-transformer>` was placed in the common `inputOutputChannelGroup` attributeGroup.
`charset` wasn't available  within `<chain>`.

* Move 'charset' from `inputOutputChannelGroup` to the new `specialized-transformer-charset-aware-type` complexType
* Add test for 'charset' within `<chain>`

JIRA: https://jira.springsource.org/browse/INT-2958
2013-03-13 12:02:09 -04:00