Commit Graph

6788 Commits

Author SHA1 Message Date
Gary Russell
403ad2edc5 INT-2776 Add Sender's UDP Port To Headers
User code can use the existing host and this new
header to send a reply over UDP.
2012-10-11 15:36:48 -04:00
Mark Fisher
1672680419 Merge pull request #643 from garyrussell/INT-2781
INT-2781 Retry Advice; Fix Recovery For Zero Tries
2012-10-11 15:15:22 -04:00
Gary Russell
8733350c43 INT-2781 Retry Advice; Fix Recovery For Zero Tries
Retry Advice (ErrorMessageSendingRecoverer) tried to send a message
with a null payload when the RetryPolicy allowed zero attempts.

Create a MessageHandlingException with the failedMessage, when
no attempts were made to call the handler.
2012-10-11 14:56:39 -04:00
Mark Fisher
0e4b250ff8 Merge pull request #645 from ghillert/INT-2753
INT-2753 - Add CONTRIBUTING.md Copied from the Contributor Guidelines wiki document [1] in order to take advantage of GitHub's new integrated support for displaying a link to contributor guidelines when issuing a pull request [2].
2012-10-11 10:29:24 -04:00
Gunnar Hillert
e86920d554 INT-2753 - Add CONTRIBUTING.md
Copied from the Contributor Guidelines wiki document [1] in order to
take advantage of GitHub's new integrated support for displaying a link
to contributor guidelines when issuing a pull request [2].

[1]: https://github.com/SpringSource/spring-integration/wiki/Contributor-Guidelines
[2]: https://github.com/blog/1184-contributing-guidelines

For reference see: https://jira.springsource.org/browse/INT-2753
2012-10-11 10:27:57 -04:00
Gary Russell
1b298bae37 Merge pull request #644 from ghillert/INT-2766 2012-10-11 10:10:12 -04:00
Gunnar Hillert
990b643e5a INT-2766 - Fix Appendices
Docbook ToC: Sections 31, 32, 33 Appear under V. Appendices
For reference: https://jira.springsource.org/browse/INT-2766
2012-10-11 01:41:33 -04:00
Mark Fisher
dfe9906bae Merge pull request #642 from garyrussell/INT-2767
INT-2767 Remove Unused Test Config
2012-10-10 19:08:31 -04:00
Gary Russell
53fd816828 INT-2767 Remove Unused Test Config
Obsolete file left over from a previous implementation
of tx synchronization.
2012-10-10 18:56:45 -04:00
Mark Fisher
33b1018a51 reverting mongodb upgrade to fix issues 2012-10-10 18:02:23 -04:00
Mark Fisher
27a292c478 INT-2779 upgrade spring-data-mongodb to 1.1.0.RELEASE 2012-10-10 17:43:18 -04:00
Mark Fisher
837562676f INT-2784 upgrade spring-data-redis to 1.0.2 2012-10-10 15:47:32 -04:00
Gary Russell
4cde75bfe1 Merge pull request #638 from artembilan/INT-2770 2012-10-09 16:23:56 -04:00
Artem Bilan
82d234d543 INT-2770 & INT-2771 fixes:
* INT-2770: fix for 'txAdviceChain' in the`AbstractJpaOutboundGatewayParser`
* INT-2771: make `AbstractReplyProducingMessageHandler.RequestHandler` public

JIRAs:
https://jira.springsource.org/browse/INT-2770
https://jira.springsource.org/browse/INT-2771
2012-10-09 16:23:01 -04:00
Gunnar Hillert
22a481321c INT-2774/75 - Polishing, remove commented out line 2012-10-03 11:35:14 -04:00
Gunnar Hillert
e9096c7846 Merge pull request #637 from garyrussell/INT-2765
# By Gary Russell
* garyrussell-INT-2765:
  INT-2765 Remove Obsolete Annotation from Docs
2012-10-03 11:29:38 -04:00
Gary Russell
039c7dff15 INT-2765 Remove Obsolete Annotation from Docs
@ChannelAdapter was removed in '08.

c16c3abb30
2012-10-03 11:27:50 -04:00
Gunnar Hillert
b85ddc52ed Merge pull request #639 from olegz:INT-2774/75
# By Oleg Zhurakousky
* olegz-INT-2774/75:
  INT-2774/75 RedisCollectionPopulatingMessageHandler fix * Added support for 'channel' attribute for RedisStore outbound adapter * Fixed logic in RedisCollectionPopulatingMessageHandler to ensure that RedisHeaders.ZSET_INCREMENT_SCORE can be passed as Boolean true/false as well as String true/false. The current solution is based on relyiong oin ConversionService registered with SpEL Context (see RedisCollectionPopulatingMessageHandler.extractZsetIncrementHeader method). This way other types could be supported without introducing any code changes.
2012-10-03 11:15:50 -04:00
Oleg Zhurakousky
3b78490221 INT-2774/75 RedisCollectionPopulatingMessageHandler fix
* Added support for 'channel' attribute for RedisStore outbound adapter
* Fixed logic in RedisCollectionPopulatingMessageHandler to ensure that RedisHeaders.ZSET_INCREMENT_SCORE can be passed as Boolean true/false as well as String true/false. The current solution is based on relyiong oin ConversionService registered with SpEL Context (see RedisCollectionPopulatingMessageHandler.extractZsetIncrementHeader method). This way other types could be supported without introducing any code changes.
2012-10-03 11:13:59 -04:00
Spring Buildmaster
9cd132be3b [artifactory-release] Next development version 2012-09-21 12:25:25 -07:00
Spring Buildmaster
a0568aed6b [artifactory-release] Release version 2.2.0.RC1 2012-09-21 12:25:19 -07:00
Gary Russell
ed92b52039 INT-2763 - Fix Failing TCP Test
Uses the ExpressionEvaluatingMessageHandlerAdvice which
has had its constructor removed.
2012-09-21 19:33:24 +01:00
Oleg Zhurakousky
3e5694e235 Merge pull request #636 from garyrussell/INT-2763
* INT-2763:
  INT-2763 Send AdviceMessage from Advice
2012-09-21 14:10:13 -04:00
Gary Russell
2340e6f442 INT-2763 Send AdviceMessage from Advice
The ExpressionEvaluatingMessageHandlerAdvice now sends an
AdviceMessage which has a payload of the original message, and
a property 'inputMessage' referencing the message that was
sent to the advised handler.

INT-2763 Expression Advice Reference Doc Update

Update to reflect the new behavior.
2012-09-21 14:08:40 -04:00
Oleg Zhurakousky
c8da0532d7 Merge pull request #635 from garyrussell/INT-2761
* INT-2761:
  INT-2761 Make Redis ZSet Default - Increment Score
2012-09-21 12:38:27 -04:00
Gary Russell
eb7638a1a0 INT-2761 Make Redis ZSet Default - Increment Score
Adding a header redis_zset_overwrite modifies behavior to
overwrite instead of incrementing score.

Remove underscores from redis headers.

INT-2761,2762 Polished ZSet operations
polished ZSet logic related to zset increment score
changed Redis class names from RedisCollections* to RedisCollection*

INT-2761,2762 polishing
2012-09-21 12:36:48 -04:00
Gunnar Hillert
8ee86f035f Merge pull request #634 from garyrussell/INT-2747
* garyrussell-INT-2747:
  INT-2747 Change Bundlor Spring Minimums
2012-09-21 10:51:18 -04:00
Gary Russell
53e5afe0b8 INT-2747 Change Bundlor Spring Minimums
While Spring Framework 3.1 is recommended for Spring
Integration  2.2, it continues to support Spring 3.0.

Change build.gradle to use 3.0.7 as the minimum instead
of 3.1.1.
2012-09-21 10:49:27 -04:00
Gary Russell
3713fd6851 Merge pull request #628 from ghillert/INT-2218-2 2012-09-21 12:54:07 +01:00
Gunnar Hillert
7055845424 INT-2218 - Chain Parser Validation Improvements
Components within Chain: Add parser validation

For reference see: https://jira.springsource.org/browse/INT-2218

INT-2218 - Code review changes

INT-2218 - Fix HttpOutboundGatewayParserTests

INT-2218 - Remove input-channel validation

Was already covered by PR #592
2012-09-21 12:22:52 +01:00
Oleg Zhurakousky
c9f73a8a49 Merge pull request #617 from garyrussell/INT-2667
* INT-2667:
  INT-2667 JMS Outbound Gateway Documentation
2012-09-20 21:36:33 -04:00
Gary Russell
2d549f077a INT-2667 JMS Outbound Gateway Documentation
Add reference docs:

- Caution about using cached consumers with a specified reply dest.

- Add <reply-listener/> docs.

INT-2667 Polishing

PR Review Comments
2012-09-20 21:35:16 -04:00
Oleg Zhurakousky
e835ce3078 Merge pull request #609 from garyrussell/INT-2741
* INT-2683-dmlc-3:
  INT-2683 Add Reply Listener Container Option
2012-09-20 21:32:31 -04:00
Gary Russell
49a6079d1a INT-2683 Add Reply Listener Container Option
INT-2683 Tests

Expanded JMS Gateway Tests

INT-2683 First commit

Listener Container Option for Replies

INT-2683 Remove no correlation-key Option

INT-2863 Support DestName and Temp Dest

INT-2683 Add back Support No CorrelationKey

INT-2683 Fix Tests

INT-2683 Polishing

Fallback if no correlationKey and fixed reply queue.

INT-2683 Polishing

Change from SMLC to DMLC

INT-2683 Polishing

Since we changed to DMLC, we can now remove the check for
SingleConnectionFactory.

INT-2683 <reply-listener/> Namespace Support

Add <reply-listener/> subelement to JMS Outbound Gateway.
2012-09-20 21:22:11 -04:00
Oleg Zhurakousky
9e8d1c83f8 Merge pull request #633 from garyrussell/INT-2759
* INT-2759:
  INT-2759 Fix Failing JPA Test
2012-09-20 12:08:55 -04:00
Gary Russell
f73522d5d0 INT-2759 Fix Failing JPA Test
Race condition for deletion after poll.

Also, during development, the batch flag was
flipped from default true to false.

This resulted in two tests for row deletion.

Changed the first test to use batch deletion.
2012-09-20 16:22:36 +01:00
Gary Russell
52d042eadc Merge pull request #632 from olegz/INT-2756 2012-09-20 14:50:38 +01:00
Oleg Zhurakousky
6db976ebaa INT-2756 Fixed SQL schema generation template
Regenerate schemas
2012-09-20 14:49:19 +01:00
Gary Russell
26e2a45ee6 Merge pull request #631 from olegz/INT-2757 2012-09-20 14:34:45 +01:00
Oleg Zhurakousky
b4af191f4f INT-2757 JdbcMessageStore fix removeMessageGroup
Fix removeMessageGroup logic to ensure it also executes
delete on the join table so there are no dangling
join rows.

Add defensive logic to the getMessageGroup method
to ensure it no longer throws an exception IF the scenario
fixed with the previous comment still re-appears
(and it can if MGS is not executed under TX).
2012-09-20 14:33:48 +01:00
Oleg Zhurakousky
06e2f61969 Merge pull request #629 from garyrussell/INT-2571a
* INT-2571a:
  INT-2751 Jdbc Message Store Group Id Issues
2012-09-19 15:39:59 -04:00
Gary Russell
de938cec27 INT-2751 Jdbc Message Store Group Id Issues
Jdbc Message Store always converts the correlation id
to a UUID string, even if it's already a String.

This causes reaper issues with the correlating message
handler because the reap occurs under
a different lock to normal group processing.

This change ensures the lock is properly mutually
exclusive.
2012-09-19 15:38:07 -04:00
Gary Russell
04547941dc Merge pull request #630 from olegz/INT-2749 2012-09-19 19:04:31 +01:00
Oleg Zhurakousky
1e74150695 INT-2749 add'long' cast to SftpFileInfo
Add cast to (long) to a return value of getMTime methood called in SftpFileInfo.getModified()
2012-09-19 19:02:02 +01:00
Oleg Zhurakousky
17b8fe1db4 Merge pull request #622 from olegz/INT-1819
* INT-1819:
  INT-1819 Mail pseudo-tx support Added pseudo-tx support for Mail inbound adapters For polling adapters no changes have been made other then returning a javax.mail.Message instead of its copy so post-tx dispositions could be performed on it. For Imap IDLE adapter changes are simiar to the once present in SPCA where TX synchronization logic was added to ImapIdleChannelAdapter Couple of things to note: First IDLE receives an array of messages while Polling task receives one message which means i need to sendMessage in the Polling task in the separate thread, so for maintaining single thread semantics we have now it uses single thread executor to send Messages Renamed MSRH to TransactionalResourceHolder since we no longer use 'source' anywhere and in the case of IDLE there is no MessageSource. Its is truly a holder of attributes we want to make available for use (e.g., SpEL)
2012-09-19 12:14:32 -04:00
Oleg Zhurakousky
ee91a6ce5a INT-1819 Mail pseudo-tx support
Added pseudo-tx support for Mail inbound adapters
For polling adapters no changes have been made other then returning a javax.mail.Message instead of its copy so
post-tx dispositions could be performed on it.
For Imap IDLE adapter changes are simiar to the once present in SPCA where TX synchronization logic was added to ImapIdleChannelAdapter
Couple of things to note:
First IDLE receives an array of messages while Polling task receives one message which means i need to sendMessage in the Polling task in the separate thread, so for maintaining single thread semantics we have now it uses single thread executor to send Messages
Renamed MSRH to TransactionalResourceHolder since we no longer use 'source' anywhere and in the case of IDLE there is no MessageSource. Its is truly a holder of attributes we want to make available for use (e.g., SpEL)

INT-1819 Polishing

- Change TransactionalResourceHolder to IntegrationResourceHolder
- Make messageSource available as an attribute
- Allow configuration of Executor for ImapIdle adapter
- Add parser test for TX ImapIdle adapter
- Fix bundlor config for mail
- Remove top level <transactional/> element that was added to core
- Restore 'legacy' mail attributes in TX, and add schema doc

INT-1819 Mail TX Reference Docs

Add reference documentation for mail transaction support.

INT-1819 Remove 'public abstract' from interface

Modifiers are not needed on an interface.
2012-09-19 12:12:31 -04:00
Gunnar Hillert
e1dd8240d0 Merge pull request #618 from garyrussell/INT-2744
* garyrussell-INT-2744:
  INT-2744 Mechanism to Suppress Standard Headers
2012-09-18 17:09:22 -04:00
Gary Russell
a37256146d INT-2744 Mechanism to Suppress Standard Headers
Currently, HTTP mappers don't know if they are inbound
or outbound. This causes problems with mapping certain
headers.

For example, on an inbound adapter, a mapped Content-Length
header should not be re-mapped to an HTTP Header during
response header mapping. However, the Content-Length
does need to be mapped on an outbound adapter response.

Introduce the notion of an exclusion list for both
request and response standard headers.

If a mapper has been configured to use standard headers,
we can detect whether the mapper is being used for inbound
or outbound mapping. We can then apply an 'exclusion' for
certain headers.

Currently, no request headers are suppressed on outbound
mappers and only the 'Content-Length' response header
is suppressed on inbound mappers.

The default mappers created via the static factory
methods use these defaults. Exposing the exclusion setters
will allow users to suppress additional headers, if
deemed necessary.
2012-09-18 17:08:15 -04:00
Gary Russell
091e3e3456 Merge pull request #621 from olegz/INT-2723 2012-09-18 16:04:55 +01:00
Oleg Zhurakousky
a013b66af0 INT-2723/24 RedisStore Inbound/Outbound docs
INT-2723 Polishing

Polish docs

Remove #store SpEL variable from the Tx Synchronization.
2012-09-18 16:04:27 +01:00