Commit Graph

7448 Commits

Author SHA1 Message Date
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
Mark Fisher
49482dd0db Merge pull request #256 from artembilan/INT-2316
INT-2316: xsd improve for reply- & error-channels
2011-12-20 11:14:21 -05:00
Artem Bilan
d7851fef5a INT-2316: xsd improve for reply- & error-channels
Now <header-enricher> <reply-channel> & <error-channel> are 'referenceOrValueHeaderType'.
Added tests for 'value' & 'expression' attributes on <reply-channel> element.
2011-12-20 11:13:19 -05:00
Mark Fisher
ba9041d641 Merge pull request #255 from markfisher/INT-2320 2011-12-20 09:25:46 -05:00
Mark Fisher
554a0be04f INT-2320 2011-12-19 23:38:14 -05:00
Mark Fisher
9a7d0c99f3 removed unused imports 2011-12-19 23:17:24 -05:00
Mark Fisher
51f33d2724 removing test warnings 2011-12-19 23:13:00 -05:00
Mark Fisher
928438bdd7 Merge pull request #248 from olegz/INT-2311 2011-12-19 19:42:57 -05:00
Oleg Zhurakousky
86c574e493 INT-2311
modified implementation of MessageGroupQueue to use interruptible locks

Basically modeled it after LinkedBlockingQueue

changed to use ReadWriteLock

refactored MessageGroupQueue and added tests

changed MessageGroupQueue to use Condition

added messageGroupSize(groupId) method to MessageGroupStore and all the implementations

polishing based on Gary's comments

removed setStoreLock method in favor of additional constructors

polishing tests, decreased timeouts

made peek() thread safe

added logging
2011-12-19 19:32:23 -05:00
Mark Fisher
d1367e06d2 INT-2305 2011-12-19 17:03:51 -05:00
Mark Fisher
84b94ec5da removed @ManagedResource from AMMR 2011-12-19 16:59:32 -05:00
Mark Fisher
84d590aeae removed suppress deprecation 2011-12-19 16:57:05 -05:00
Mark Fisher
0d8d7b43c7 create FileInputStream as late as possible 2011-12-19 16:48:23 -05:00
Mark Fisher
5805528faa removing warnings 2011-12-19 16:38:48 -05:00
Mark Fisher
af1d0859d1 un-deprecated setChannelResolver() method
the XSD attribute IS deprecated, but this method is needed internally
2011-12-19 16:29:12 -05:00
Mark Fisher
267ff634ec Sonar: self-assignment 2011-12-19 16:14:35 -05:00
Mark Fisher
de47b50494 Merge pull request #253 from ghillert/INT-2314
Document use-payload-as-parameter-source attribute
2011-12-19 15:49:59 -05:00
Gunnar Hillert
3b7bd6e6dd Document use-payload-as-parameter-source attribute
For reference see: https://jira.springsource.org/browse/INT-2314

* Updated 2.1 JDBC XML Schema
* Updated Docbook Reference Manual
2011-12-19 15:48:53 -05:00
Mark Fisher
092fa44552 Merge pull request #251 from artembilan/INT-2315
headerValueRouter chain mapping minOcc=0
2011-12-19 15:42:29 -05:00
Artem Bilan
83700f73f4 INT-2315 headerValueRouter chain mapping minOcc=0
now <header-value-router> doesn't require mapping when it is defined inside <chain>.
Tests for <header-value-router> inside <chain>.
2011-12-19 15:41:01 -05:00
Mark Fisher
6f10e92f77 Merge pull request #249 from markfisher/INT-2301
added reply-timeout support for WS inbound-gateway
2011-12-19 15:34:51 -05:00
Mark Fisher
cd499cfc50 added reply-timeout support for WS inbound-gateway 2011-12-19 15:33:00 -05:00
Mark Fisher
962fcb000a Merge pull request #250 from garyrussell/INT-2313
INT-2313 Avoid Naming Conflicts With Mutliple Ctx
  INT-2307 added MBeanExporterHelper to avoid conflicts with core MBeanExporter
2011-12-19 12:43:27 -05:00
Gary Russell
cfc37616e5 INT-2313 Avoid Naming Conflicts With Mutliple Ctx
If multiple application contexts exist in the same JVM, where
managed beans exist with the same name, InstanceAlreadyExistsExceptions
could result.

1. Change int-jmx MBean exporter parser to ensure the exporter itself
has a unique name within the JVM.
2. When the IMBE exports Integration components for monitoring, where
the component itself is already an MBean, add domain and object name
static properties configured in the MBean exporter.
3. Add tests to load the same ac a second time to ensure no naming
conflicts arise.
2011-12-19 12:42:16 -05:00
Oleg Zhurakousky
1a56747a8a INT-2307
added MBeanExporterHelper to avoid conflicts with core MBeanExporter

INT-2307 polishing

INT-2307 polishing
2011-12-19 12:42:16 -05:00
Mark Fisher
6e6e972e35 INT-2291 no longer counting down in failing handler or unexpected handler 2011-12-19 12:08:49 -05:00
Mark Fisher
5f19e731ac Merge pull request #252 from olegz/INT-2291
INT-2291

  * polished MixedDispatcherConfigurationScenarioTests.failoverNoLoadBalancingWithExecutorConcurrent() test even more
  * introduced 'taskSubmissionMonitor' as CountDownLatch to ensure that shutdown command is not called until all tasks are submitted
  * also made sure that ExecutorChannel is using the same task executor so shutdown command actually shuts down the same executor
2011-12-19 10:30:15 -05:00
Oleg Zhurakousky
8869da7a95 INT-2291
polished MixedDispatcherConfigurationScenarioTests.failoverNoLoadBalancingWithExecutorConcurrent() test even more, introduced 'taskSubmissionMonitor' as CountDownLatch to ensure that shutdown command is not called untill all tasks are submitted. Also made sure that ExecutorChannel is using the same tasks executor so shutdown command actually shuts down the same executor.
2011-12-19 09:22:47 -05:00
Oleg Zhurakousky
22cbe9e0dd INT-2291 polished broken test 2011-12-19 08:58:59 -05:00
Mark Fisher
a009a05dc3 Merge pull request #211 from artembilan/INT-2236
INT-2236: limitations while using persistent MessageStore
2011-12-16 16:19:12 -05:00