Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,821 Commits 25 Branches 0 Tags
73faefa22ca43979d4b4c57055e10652d1c9e5f5
Commit Graph

6821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gary Russell
73faefa22c Merge pull request #663 from ghillert/INT-2804 2012-11-02 12:27:35 -04:00
Gunnar Hillert
4aaa59e758 INT-2804 - Update Spring dependency to 3.1.3 
INT-2806 - Update Spring Security dependency to 3.1.3

For reference see:

* https://jira.springsource.org/browse/INT-2804
* https://jira.springsource.org/browse/INT-2806
 2012-11-01 17:14:12 -04:00
Mark Fisher
66200e94a2 Merge pull request #655 from garyrussell/INT-2788 
* INT-2788 AMQP return-channel Doc. Improvements
 2012-11-01 12:13:27 -04:00
Gary Russell
c52babd068 INT-2788 AMQP return-channel Doc. Improvements 
Clarify the configuration needed for returned messages.

INT-2788 Fix Link to spring-amqp Reference

Broken link.
 2012-11-01 12:11:55 -04:00
Gunnar Hillert
c363ceaa9d Merge pull request #661 from ghillert/INT-2802 
* ghillert-INT-2802:
  INT-2802 - Upgrade build.gradle to use Gradle 1.2 For reference see: https://jira.springsource.org/browse/INT-2802
 2012-10-31 17:21:29 -04:00
Gunnar Hillert
2d81f3cc27 INT-2802 - Upgrade build.gradle to use Gradle 1.2 
For reference see: https://jira.springsource.org/browse/INT-2802
 2012-10-31 17:19:54 -04:00
Mark Fisher
83a25b80b7 Merge pull request #658 from ghillert/INT-2794 
INT-2794 - Spring Integration WS should depend on spring-webmvc

  INT-2795 - Update Spring WS dependency to 2.1.1.RELEASE

  INT-2796 - Update Spring-XML dependency to 2.1.1.RELEASE
 2012-10-30 10:31:00 -04:00
Gunnar Hillert
fef6b356f8 INT-2794 - Spring Integration WS should depend on spring-webmvc 
INT-2795 - Update Spring WS dependency to 2.1.1.RELEASE
INT-2796 - Update Spring-XML dependency to 2.1.1.RELEASE

Reference: https://jira.springsource.org/browse/INT-2794
 2012-10-30 09:44:08 -04:00
Mark Fisher
57e7e400ca Merge pull request #657 from ghillert/INT-2790 
INT-2790 - extractZsetIncrementHeader should return 'true' by default For reference: https://jira.springsource.org/browse/INT-2790
 2012-10-30 09:38:54 -04:00
Gunnar Hillert
d3152618ca INT-2790 - extractZsetIncrementHeader should return 'true' by default 
For reference: https://jira.springsource.org/browse/INT-2790
 2012-10-25 16:12:54 -04:00
Spring Buildmaster
49039766e8 2012-10-19 10:04:03 -07:00
Spring Buildmaster
2d64696fe1 Release version 2.2.0.RC2 2012-10-19 10:03:56 -07:00
Oleg Zhurakousky
c7292535e2 Merge pull request #654 from olegz/INT-2779 
* INT-2779-bundlor:
  INT-2779-bundlor fixed manifest template
 2012-10-19 12:11:22 -04:00
Oleg Zhurakousky
e74e470d3d INT-2779-bundlor fixed manifest template 2012-10-19 12:07:33 -04:00
Oleg Zhurakousky
23b0575a0c Merge pull request #646 from olegz/INT-2779 
* INT-2779:
  INT-2779 spring-data-mongo upgrade upgraded to spring-data-mongo-1.1.1.RELEASE removed safety logic that was put temporarily to address DATAMONGO-550/551
 2012-10-19 11:22:03 -04:00
Oleg Zhurakousky
65ca797721 INT-2779 spring-data-mongo upgrade 
upgraded to spring-data-mongo-1.1.1.RELEASE
removed safety logic that was put temporarily to address DATAMONGO-550/551
 2012-10-19 11:20:00 -04:00
Oleg Zhurakousky
b61a4fcb6d Merge pull request #653 from artembilan/INT-2777 
* INT-2777-1:
  INT-2777 TxSynchFactory: tests for bound resource
 2012-10-19 10:28:30 -04:00
Artem Bilan
4dfbcf9777 INT-2777 TxSynchFactory: tests for bound resource 2012-10-19 10:27:24 -04:00
Oleg Zhurakousky
7fcb5cbb45 Merge pull request #652 from artembilan/INT-2766 
* INT-2766-1:
  INT-2766: fix early closed tag <appendix>
 2012-10-19 10:25:57 -04:00
Artem Bilan
6e6d5a9240 INT-2766: fix early closed tag <appendix> 2012-10-15 14:48:14 +03:00
Gary Russell
6747f69a77 Merge pull request #650 from smokku 2012-10-12 11:35:29 -04:00
Tomasz Sterna
9e5ec80533 INT-2786 Do not Provide Fixed XMPP Resource String 
Previously, the connection resource was hard-coded to 'Smack' by
default.

According to RFC 6120 section 7.6.  Server-Generated Resource Identifier
if the connecting client does not provide resource string, server will
generate RANDOM one for it.
Smack API allows this by providing null resource in
XMPPConnection#login(username, password, resource) call.
See Smack's SASLAuthentication documentation.

Tested with XMPP sample (including default resource and configuring
as 'Smack').
 2012-10-12 11:34:21 -04:00
Mark Fisher
f9ce029366 Merge pull request #651 from garyrussell/INT-2782 
INT-2782 Fix spring-retry Import-Package
 2012-10-12 10:21:39 -04:00
Gary Russell
870f6b0fe3 INT-2782 Fix spring-retry Import-Package 
Bundlor: move retry packages above catch-all org.springframework.*
in the import template.
 2012-10-12 09:27:29 -04:00
Gary Russell
2012ff0ef6 Merge pull request #648 from olegz/INT-2280 2012-10-11 21:03:35 -04:00
Oleg Zhurakousky
b2ffe2f510 INT-2280 fixed broken JDBC test 
Fix JdbcMessageStoreChannelTests.testSendAndActivateWithRollback as well as others by changing poller interval.

Poller was polling too quickly, so even the slightest delay before assertion would result in another Message in the Service.messages thus the intermittent assertion error.

INT-2280 Polishing

Don't add retries to message list.
 2012-10-11 21:02:15 -04:00
Gary Russell
dc63007352 Merge pull request #640 from artembilan/INT-2773 2012-10-11 18:37:32 -04:00
Artem Bilan
eb1500cb7e INT-2773: Fix AmqpOutboundEndpoint's properties 
* make `AmqpOutboundEndpoint` 'exchangeName' & 'routingKey' **null** by default
* some polishing for `AmqpOutboundEndpoint`
* verification tests for parameters of `com.rabbitmq.client.Channel#basicPublish`

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

INT-2773 Polishing - Allow Override to ""

Previously, there was no way to revert to the previous
behavior by specifying an empty string for the attribute(s).

Add test to verify setting attributes to "" overrides template.
 2012-10-11 18:36:15 -04:00
Gary Russell
ef2549cf22 Merge pull request #647 from olegz/INT-2777 2012-10-11 17:47:52 -04:00
Oleg Zhurakousky
8c43c59c03 INT-2777 TransactionSynchronization 
Ensured that bindings of the resource only happen if TransactionSynchronizationFactory is not null
Add documentation describing the expectation for the unbinding of the resource.

INT-2777 Polishing

Don't set up holder if it's not used.

Doc fixes.
 2012-10-11 17:46:45 -04:00
Mark Fisher
cd1b36d67b Merge pull request #649 from olegz/INT-2764 
INT-2764 added what's new for Redis/Mongo adapters
 2012-10-11 17:16:05 -04:00
Oleg Zhurakousky
e01d7fc922 INT-2764 added what's new for Redis/Mongo adapters 2012-10-11 17:13:55 -04:00
Mark Fisher
cc301226ce Merge pull request #641 from garyrussell/INT-2776 
INT-2776 Add Sender's UDP Port To Headers
 2012-10-11 15:46:07 -04:00
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