Commit Graph

6769 Commits

Author SHA1 Message Date
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
Oleg Zhurakousky
b9e7762429 Merge pull request #627 from garyrussell/INT-2751
* INT-2751:
  INT-2751 Fix Reaper Race Condition
2012-09-18 09:52:41 -04:00
Gary Russell
913a8058dd INT-2751 Fix Reaper Race Condition
When the reaper runs, and finds a group that is in the
process of being completed, the reaper blocks on the
lock, but when the lock is released, goes ahead and
reaps the group.

Now, after obtaining the lock, the reaper checks to
see if the modified date changed and, if so, aborts
the reap of the group this time around.

Required adding lastModified accounting for SimpleMessageGroup
(accounting already exists for other message groups).

Test case reproduced the problem, demonstrating duplicate
output messages.

After the fix, it shows the reap was aborted in the debug
log.

INT-2751 Polishing

PR Comments
2012-09-18 09:52:09 -04:00
Oleg Zhurakousky
c24d8e7395 Merge pull request #613 from johndoe/INT-2695
* INT-2695:
  INT-2695 WS Support URI Schemes Other than http(s)
2012-09-18 09:42:12 -04:00
Gary Russell
40ce2ab793 INT-2695 WS Support URI Schemes Other than http(s)
Previously, only http: or https: URI schemes were supported
by the uri attribute. To use other schemes (such as jms:),
you had to provide a DestinationProvider.

Add support for schemes other than http and https by
creating a DestinationProvider internally when such a
URI is detected.

Note: <uri-variable/>s are NOT supported except when
a URI with an http(s) scheme is provided. An exception
is thrown if variables are provided with an incompatible
URI, or if a DestinationProvider is supplied.

This could break existing applications that provide an
external DestinationProvider and have configured
<uri-variable/>s. Previously, these variables were
simply ignored.
2012-09-18 09:41:18 -04:00
Oleg Zhurakousky
e337521958 Merge pull request #616 from garyrussell/INT-2742
* INT-2742:
  INT-2742 Fix TCP Test Case Race Condition
2012-09-18 09:17:53 -04:00
Gary Russell
e77811c59f INT-2742 Fix TCP Test Case Race Condition
Test data was sent before the error-channel was added to
the inbound adapter; the expected error could occur before
the error-channel was in place and the test failed
because the expected error message was absent.

Move the error-channel setup to before the test
data is sent.
2012-09-18 09:16:28 -04:00
Oleg Zhurakousky
03e60171ec Merge pull request #623 from garyrussell/INT-2748
* INT-2748:
  INT-2748 Change CircuitBreaker Exception
2012-09-18 09:07:25 -04:00
Gary Russell
2959db8631 INT-2748 Change CircuitBreaker Exception
Previously, when the breaker was open, it threw a
MessagingException. This was not wrapped so normal
error-channel processing 'payload.cause.message'
failed because the cause was null.

Change the exception to a new private
CircuitBreakerOpenException.
2012-09-18 09:06:20 -04:00
Oleg Zhurakousky
fe80265ace Merge pull request #615 from garyrussell/INT-2699
* INT-2699:
  INT-2699 Reference Docs for Tx Synchronization
2012-09-18 08:27:22 -04:00
Gary Russell
4b1bb376e5 INT-2699 Reference Docs for Tx Synchronization
- What's new
- Transaction appendix

INT-2699 Change Holder Class Name
2012-09-18 08:26:30 -04:00
Gary Russell
ad72515e58 Merge pull request #626 from ghillert/INT-2752
* INT-2752:
  INT-2752 - Fix build.gradle for Spring 3.2 compatibility For reference: https://jira.springsource.org/browse/INT-2752
2012-09-18 00:06:05 +01:00
Gunnar Hillert
4be6a33450 INT-2752 - Fix build.gradle for Spring 3.2 compatibility
For reference: https://jira.springsource.org/browse/INT-2752
2012-09-18 00:04:55 +01:00
Gunnar Hillert
abc37560b8 Merge pull request #625 from garyrussell/INT-2750
* garyrussell-INT-2750:
  INT-2750 Fix GatewayProxyFactoryBean Javadoc
2012-09-17 16:16:07 -04:00
Gary Russell
1d03acbc31 INT-2750 Fix GatewayProxyFactoryBean Javadoc
Default serviceInterface is RequestReplyExchanger.
2012-09-14 12:21:51 -04:00
Gary Russell
921e9d6a36 Merge pull request #620 from olegz/INT-2725 2012-09-12 16:03:51 -04:00
Oleg Zhurakousky
64c6d850af INT-2725/26 MongoDb Adapter Docs 2012-09-12 16:01:25 -04:00
Gary Russell
333fc19e01 Merge pull request #592 from artembilan/INT-2718 2012-09-10 16:14:25 -04:00
Artem Bilan
31d0e42c1a INT-2718 & INT-2721: fixes for <chain> & fix bugs
* ban to use 'channel' and 'request-channel' attributes for 'outbound-channel-adapters' and 'outbound-gateways' when they are declared inside the `<chain>`
* fix usage of `<request-handler-advice-chain>` for components when they are declared inside the `<chain>`
* ban to use `<request-handler-advice-chain>` for 'outbound-channel-adapters' when they are declared inside the `<chain>` don't implement `AbstractReplyProducingMessageHandler`
* refactor `IntegrationNamespaceUtils` to use `BeanDefinition` instead of `BeanDefinitionBuilder` for 'advice-chain' parsing
* tests for new logic for 'channel' and 'request-channel' attributes within `<chain>`
* tests for new logic for `<request-handler-advice-chain>` within `<chain>`
* fix failed test on slow machine
* fix `SysLogTransformer` tests

For reference:
https://jira.springsource.org/browse/INT-2718
https://jira.springsource.org/browse/INT-2721
https://jira.springsource.org/browse/INT-2719

INT-2718 Polishing
2012-09-10 16:13:45 -04:00
Mark Fisher
063c5c8269 Merge pull request #614 from garyrussell/INT-2740
INT-2740 MessageSelector w/ Pollable JMS Channel
2012-09-07 16:50:59 -04:00