Commit Graph

6227 Commits

Author SHA1 Message Date
Mark Fisher
6d033bae4a Merge pull request #285 from garyrussell/INT-2347
* INT-2347:
  INT-2347 Update Channel Mappings Atomically
2012-01-03 11:44:53 -05:00
Gary Russell
5750ca5ff5 INT-2347 Update Channel Mappings Atomically
Ensure consistent state if channel map is replaced
dynamically.
2012-01-03 11:44:13 -05:00
Mark Fisher
f3155f86fa corrected reversed test method names 2012-01-03 11:30:45 -05:00
Gary Russell
85ea4f6411 INT-2342 Add Test Cases 2012-01-03 11:19:52 -05:00
Mark Fisher
f5cabd8085 Merge pull request #284 from markfisher/INT-2342
* INT-2342:
  INT-2342
2012-01-03 11:18:48 -05:00
Mark Fisher
ffe132986b INT-2342 2012-01-03 11:17:47 -05:00
Mark Fisher
abe6220e02 Update version to 2.1.0.BUILD-SNAPSHOT 2011-12-23 12:15:13 -05:00
Mark Fisher
e67c115004 Release version 2.1.0.RC2 2011-12-23 12:00:52 -05:00
Mark Fisher
886daa0bfb updated release date in changelog 2011-12-23 11:28:27 -05:00
Mark Fisher
4de72a3fe6 Merge pull request #283 from ghillert/INT-2339
INT-2339 - Make spring-tx an explicit dependency for the Spring Integration MongoDb Module

  remove unnecessary spring-context dependencies since it's brought in spring-tx
2011-12-23 10:48:11 -05:00
Gunnar Hillert
0c376dd694 INT-2339 - Make spring-tx an explicit dependency
for the Spring Integration MongoDb Module

Also addresses: https://jira.springsource.org/browse/INT-2340

For reference see: https://jira.springsource.org/browse/INT-2339
2011-12-23 10:39:23 -05:00
Mark Fisher
1435dc5794 Merge pull request #281 from olegz/INT-2334
INT-2334 Fix for MongoDbMessageStore storing MessageHistory
2011-12-22 23:26:00 -05:00
Mark Fisher
8ddb6d5c6b polishing 2011-12-22 23:25:08 -05:00
Sean Brandt
0fe6a76453 INT-2334 Fix for MongoDbMessageStore storing MessageHistory
This fix ensures that MongoDbMessageStore properly stores
MessageHistory that is stored in the 'history' header
of MessageHeaders.

polished contribution from Sean Brandt, added tests

fixed header deserialization logic to ensure that objects are converted to a proper type

removed write converter
2011-12-22 23:24:48 -05:00
Mark Fisher
953d8a62d2 Merge pull request #282 from olegz/INT-2338
INT-2338 added MessageHistory tests to all implementations of MessageStore
2011-12-22 22:46:42 -05:00
Oleg Zhurakousky
c825689d60 INT-2338
added MessageHistory tests to all implementations of MessageStore
2011-12-22 21:23:49 -05:00
Mark Fisher
52dd9e8aab Merge pull request #277 from garyrussell/INT-2333a
INT-2333 Mac OSX TCP Workaround on Server Side
2011-12-22 16:42:12 -05:00
Gary Russell
3c49cb3480 INT-2333 Mac OSX TCP Workaround on Server Side
Mac OSX problem was encountered only on the client; similar
code exists on the server side, so the workaround should
be implemented there too; just in case.
2011-12-22 16:26:50 -05:00
Mark Fisher
1a7dae5f27 Merge pull request #276 from garyrussell/INT-2333
INT-2333 Work Around for MAC OSX JVM Bug
2011-12-22 15:54:07 -05:00
Gary Russell
49c52353cd INT-2333 Work Around for MAC OSX JVM Bug
Selector.select() throws CancelledKeyException when selecting
on a closed socket.

http://java.net/jira/browse/MACOSX_PORT-526

Work around is to catch the exception and continue.
2011-12-22 15:53:03 -05:00
Mark Fisher
bc09b0617c INT-2229 upgraded spring-data-mongodb dep to 1.0 GA 2011-12-22 15:35:36 -05:00
Mark Fisher
21c727b6fe INT-2329 upgrading to Spring 3.0.7 2011-12-22 15:27:53 -05:00
Mark Fisher
2dce55f39e Merge pull request #274 from ghillert/INT-2330
INT-2330 - Upgrade to Apache commons-net 3.0.1

  For reference see: https://jira.springsource.org/browse/INT-2330
2011-12-22 12:35:36 -05:00
Gunnar Hillert
1b0e4f2984 INT-2330 - Upgrade to Apache commons-net 3.0.1
For reference see: https://jira.springsource.org/browse/INT-2330
2011-12-22 12:32:05 -05:00
Mark Fisher
0d50f671e3 Merge pull request #272 from olegz/INT-2331
INT-2331 fixed aggregator documentation
2011-12-22 09:11:38 -05:00
Oleg Zhurakousky
06bc10e960 INT-2331 fixed aggregator documentation
INT-2331 polishing
2011-12-22 09:09:57 -05:00
Mark Fisher
6e7654c97d Merge pull request #271 garyrussell/INT-2332
INT-2332 Remove Benign Exceptions From Maven Build
2011-12-22 08:39:13 -05:00
Gary Russell
0f01ba20ea INT-2332 Remove Benign Exceptions From Maven Build
The IP module produced a significant number of benign exceptions
during a maven build. Due to auto-startup adapters with a
small retry-interval for client-mode adapters.
2011-12-21 23:34:47 -05:00
Oleg Zhurakousky
d9531a74fd INT-2328-v3 polishing tests 2011-12-21 14:10:08 -05:00
Oleg Zhurakousky
70f8177a6d INT-2328-v2
SubscribableRedisChannel as well as other components to initialize MessageListenerAdapter as it is now neccessery after Redis upgrade

INT-2328-v2 polishing

INT-2328-v2 polishing
2011-12-21 12:59:00 -05:00
Oleg Zhurakousky
0137a3023f INT-2327-v2 polishing
fixed the initialization routine to perform only once
2011-12-21 12:50:15 -05:00
Mark Fisher
a6300bc497 Merge pull request #265 from olegz/INT-2328
INT-2328 added Null checks to SubscribableRedisChannel
2011-12-21 11:02:38 -05:00
Oleg Zhurakousky
cceace69ca INT-2328 added Null checks to SubscribableRedisChannel 2011-12-21 11:01:08 -05:00
Mark Fisher
12b4fb6bca Merge pull request #264 from olegz/INT-2327
INT-2327 added Null check to SubscribableJmsChannel
2011-12-21 10:59:56 -05:00
Oleg Zhurakousky
00448ebfcd INT-2327 added Null check to SubscribableJmsChannel
INT-2327 polishing

INT-2327 polishing
2011-12-21 10:59:09 -05:00
Mark Fisher
8ebf99a0a8 Merge pull request #263 from artembilan/INT-2325 2011-12-21 10:29:25 -05:00
Artem Bilan
ec8c3e62f4 INT-2325
* fix RedisChannelParser 'serializer' ref
  * some RedisChannelParser polishing
  * test for 'serializer' attribute
  * SubscribableRedisChannel delegates getPhase() to container
2011-12-21 10:27:54 -05:00
Mark Fisher
f701ecccf5 updated changelog date 2011-12-20 18:01:19 -05:00
Mark Fisher
5fae7d2a1f fixed RouterFactoryBean 2011-12-20 17:41:21 -05:00
Oleg Zhurakousky
03754b917a INT-2307
fixed NPE due to the missing class name from BeanDefinition
2011-12-20 16:23:14 -05:00
Mark Fisher
df0e6bd51b excluding spring deps from mongo module 2011-12-20 14:52:31 -05:00
Mark Fisher
f3fd94b0e6 updated info docs for RC2 2011-12-20 14:21:45 -05:00
Mark Fisher
81fdf511ff Merge pull request #258 from olegz/INT-2319-v2 2011-12-20 14:11:32 -05:00
Oleg Zhurakousky
dd66c98f61 INT-2319
changed logic behind default group id for QueueChannel to be messageStoreId:channelId

added support for resolving value if it is a placeholder
2011-12-20 14:10:40 -05:00
Mark Fisher
d07975319f Merge pull request #259 from olegz/INT-2321 2011-12-20 14:07:35 -05:00
Oleg Zhurakousky
50e1fddaf5 INT-2321
Handlers within a chain are no longer registered as beans in the context.
2011-12-20 13:58:07 -05:00
Mark Fisher
9f0dd7d0cd Merge pull request #260 from markfisher/INT-2322 2011-12-20 13:43:38 -05:00
Mark Fisher
77abc55a1e INT-2322 2011-12-20 13:18:57 -05:00
Mark Fisher
41be270170 Merge pull request #257 from olegz/SONAR
INT-2323
2011-12-20 12:14:54 -05:00
Oleg Zhurakousky
a44d150009 INT-2323
made changes based on Sonar suggestions

added optional rome dependency to HTTP module
2011-12-20 12:12:20 -05:00