Commit Graph

7448 Commits

Author SHA1 Message Date
Mark Fisher
ff039c3ea2 Merge pull request #679 from garyrussell/INT-2820
* INT-2820: Shutdown Default Idle Executor
2012-11-20 18:09:39 -05:00
Gary Russell
cb87246d47 INT-2820 Shutdown Default Idle Executor
The default executor for sending messages from the IMAP IDLE
channel adapter is a single threaded thread pool.

If the default executor is used (no executor injected), shut
it down when the adapter is stopped.

INT-2820 Polishing

If using the default sendingTaskExecutor, create a new one
when restarted.

Add test to restart adapter after stop.

INT-2820 Polishing

Review comments; protect for null sendingTaskExecutor.
2012-11-20 18:01:01 -05:00
Mark Fisher
2461b3548d Merge pull request #678 from garyrussell/INT-2821
* INT-2821: Find Existing Mails if No RECENT Support
2012-11-20 17:02:57 -05:00
Gary Russell
aa6d4a4ac7 INT-2821 Find Existing Mails if No RECENT Support
Previously, if an IMAP server supports IDLE, but not
RECENT, no existing messages were retrieved until a new
message arrived.

INT-2821 Polishing - Fix Race Condition

Use searchForMessages() when server doesn't support RECENT.

Simply skipping the first idle() doesn't work
because receive() closes the folder, there was a race condition
where a new message could arrive between the previous receive()
and folder.open() in waitForMessages().

Updated mock test so that first call to waitForMessages() finds
messages and does not idle(), and subsequent calls does not
find messages and goes to idle().

Also tested in the debugger against gmail which (at the time of
writing) does not support RECENT.
2012-11-20 12:50:18 -05:00
Gary Russell
78394aa5dd Merge pull request #674 from markfisher/INT-2798 2012-11-19 15:40:39 -05:00
Mark Fisher
0e23d17526 INT-2798 Rename Redis Store Adapters
Polishing

Renaming and Repackaging.

INT-2798 Add More Tests

Add more tests for Store Outbound Adapter.

INT-2798 Polishing

More tests - zset increment/overwrite with Map payload.
           - use different value for simple overwrite.
2012-11-19 15:38:21 -05:00
Gunnar Hillert
5b0b0d731f Merge pull request #675 from garyrussell/INT-2815
# By Gary Russell
* garyrussell-INT-2815:
  INT-2815 Support Tx Synch In Pollable Consumers
2012-11-14 01:45:52 -05:00
Gary Russell
bcce3277e5 INT-2815 Support Tx Synch In Pollable Consumers
Pull transaction synchronization code up from SPCA
to AbstractPollingEndpoint, providing support for
transaction synchronization in PollingConsumer.

Also, ensure headers are copied to any message generated by the
ExpressionEvaluatingTransactionSynchronizationProcessor.
2012-11-14 01:19:47 -05:00
Gary Russell
5f2cc5a587 Merge pull request #673 from markfisher/INT-2811 2012-11-09 16:25:11 -05:00
Gary Russell
f501a6730e INT-2799/2811 Redis Store Adapter Changes
INT-2799 Use StringRedisTemplate by default on both inbound
and outbound store adapters.

Use a RedisTemplate with String key serializers and JDK
value serializers on the outbound store adapter if
'extract-payload-elements' is false.

INT-2811 Remove the ability to configure serializers on the adapters.

Use an external RedisTemplate for customized serialization
strategies.

INT-2811 Polishing (Review)

Polishing and updated Reference Doc.

polishing

using setters instead of ctor args for key or keyExpression

INT-2811 Polishing

Improve message when handler not initialized.

Add test for storing a simple value in a map.
2012-11-09 16:19:25 -05:00
Mark Fisher
3d93bb409e Merge pull request #672 from garyrussell/INT-2438
* INT-2438: Fix Temporary Remote Directory
2012-11-09 14:49:06 -05:00
Gary Russell
cc90ce92b0 INT-2438 Fix Temporary Remote Directory
The final remote directory expression processor was being
used instead of the temporary directory expression processor.

Add a test to confirm the correct processors are used.
2012-11-09 14:47:49 -05:00
Mark Fisher
97caba30cc Merge pull request #670 from garyrussell/INT-2814
* INT-2814: Fix OSGI Versions for OXM/WS
2012-11-09 14:42:18 -05:00
Gary Russell
c09ac0b5a8 INT-2814 Fix OSGI Versions for OXM/WS
OSGI version ranges were incorrect for oxm because it moved
to core. This precluded use with Spring 3.1 with OSGI.

Update oxm version range to match other Spring core modules.

Also update maximum for Spring-WS to < 3.0.0 and minumum to 2.0.0.

Also fix bundlor version ranges for new JPA module.
2012-11-09 11:09:31 -05:00
Gary Russell
32ccfda5d5 Merge pull request #660 from michaljemala 2012-11-08 15:12:54 -05:00
michaljemala
1eb1301b1f INT-2801 Twitter: Fix Init. of Metadata Key
Key was not initialized unless authorized.
2012-11-08 15:10:25 -05:00
Gary Russell
2055e48111 Merge pull request #668 from markfisher/INT-2812 2012-11-07 15:51:18 -05:00
Mark Fisher
985374ca69 INT-1812 eliminated package cycles 2012-11-07 15:50:00 -05:00
Mark Fisher
a5b13dba44 Merge pull request #667 from garyrussell/INT-2792
* INT-2792: Update spring-amqp Version to 1.1.3
2012-11-07 09:17:08 -05:00
Gary Russell
959bb314e1 INT-2792 Update spring-amqp Version to 1.1.3
1.1.3.RELEASE includes enhanced JsonMessageConverter to
support applications using the ObjectToJsonTransformer.

avoid warning in AmqpOutboundGatewayParserTests
2012-11-07 09:15:33 -05:00
Mark Fisher
956bece7b3 Merge pull request #666 from garyrussell/INT-2797a
* INT-2797 Document JSON Transformer content-type
2012-11-06 14:11:50 -05:00
Gary Russell
16ff848321 INT-2797 Document JSON Transformer content-type
Add note about content-type for the <object-to-json-transformer/>
and the caveat for when using AMQP adapters.

INT-2797 Polishing

Add alternative solutions, including setting a defaultType on
an inbound JsonMessageConverter.
2012-11-06 14:09:25 -05:00
Mark Fisher
1c8b849af7 Merge pull request #664 from garyrussell/INT-2803
* INT-2803 Fix Lazy Fetch of Email Messages
* polishing: IntegrationMimeMessage wrapper class is now private
2012-11-05 13:02:27 -05:00
Mark Fisher
991818275e IntegrationMimeMessage wrapper class is now private 2012-11-05 13:00:37 -05:00
Gary Russell
413d5354a1 INT-2803 Fix Lazy Fetch of Email Messages
INT-2805 Update JavaMail to 1.4.5

There is a need to fetch the entire email message before the folder
is closed. Once the folder is closed, you cannot perform any
more operations on the message.

Prior to RC1, the message was copied, which forced an eager fetch.

Add code to copy the message.

Also, transaction synchronization operations need access to a folder
instance to perform operations, such as delete, on a message.

Add a wrapper to lazily create a folder instance in message.getFolder()
when needed.

Add documentation to explain that messages must be re-fetched before
performing transaction synchronization operations.

JavaMail 1.4.5 is now Open Source, which makes debugging much
easier.
2012-11-05 12:47:35 -05:00
Mark Fisher
bc8d499054 Merge pull request #665 from garyrussell/INT-2800
* INT-2800: Add search-term-strategy to IMAP Adapter
2012-11-05 12:33:45 -05:00
Gary Russell
d8d77a9bbc INT-2800 Add search-term-strategy to IMAP Adapter
Previously, the ability to customize the search term
strategy was added to the IMAP Idle adapter; it should
also be available to the polled IMAP adapter.

Add the attribute.

Remove some obsolete code from the parser.
2012-11-05 12:32:36 -05:00
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