1088 Commits

Author SHA1 Message Date
Oleg Zhurakousky
562a53de87 INT-2502-backport Improve Locking, Race Condition
INT-2502-backport Polishing
2012-03-29 12:05:59 -04:00
Artem Bilan
95f29507a7 INT-2405 fix MessageProcessor for <header-value>
1. MethodInvokingHeaderValueMessageProcessor => MessageProcessingHeaderValueMessageProcessor because now he uses MessageProcessor
2. polishing HeaderEnricherParserSupport
3. GroovyHeaderEnricherTests: add check to HeaderValueMessageProcessor for Groovy scripts.
4. build.gradle: add dependency to 'spring-integration-test' for 'spring-integration-groovy'.
5. Fix HeaderEnricherParserSupport like in INT-2188
2012-03-26 10:53:48 -04:00
Gary Russell
ec003d8c05 INT-2449 Fix PubSub Subscriber Accounting Backport
PubSub channel subscriber accounting was incorrect; the counter
was not decremented when unsubscribing.

The handler count, reflecting the current number of subscriptions,
was maintained in the AbstractSubscribableChannel. The count really
belongs in the dispatcher and calls should be delegated to it, particularly
for a custom ASC, which might have a custom AbstractDispatcher.

However, it is possible (although perhaps rare) that someone
could implement a custom channel with a custom dispatcher that
is *not* a subclass of AbstractDispatcher.

Therefore, we now delegate to the dispatcher if we can, and
revert to a counter in the channel if we can't.

Also, the asymmetric accounting in this case is resolved; the
counter is decremented when a subscriber unsubscribes.

Polishing - factor out common code.
2012-03-26 10:45:36 -04:00
Artem Bilan
37c7e3c2c6 INT-2439 PollerParser adviceChain.add(customBean)
Fix PollerParser#configureAdviceChain for adding 'customBeanDefinition' into 'adviceChain' List.
PollerParserTests: adding <tx:advice> as customElement into poller's <advice-chain>.
2012-03-13 11:42:06 -04:00
Oleg Zhurakousky
dad420c6ac INT-2412-maint backport
added validation for 'priority' header, added tests
2012-02-13 12:08:46 -05:00
Artem Bilan
96e8d04cc0 INT-2399 fix processMessage for service-activator
ServiceActivatorFactoryBean#createMessageProcessingHandler: force 'processMessage' method-name parameter into constructor ServiceActivatingHandler for MessageProcessor
Test for check 'handlerMethods' in ServiceActivatingHandler's MethodInvokingMessageProcessor
Integration test for <service-activator> with invalid Groovy inline script
2012-02-06 10:04:38 -05:00
Gary Russell
d4e9cf5d83 NT-2400 Fix tool:expected-type Classes
* MessageChannel was moved from core to the base package.
* ChannelResolver moved from core to support.
* TcpConnectionInterceptorFactoryChain was incorrect.

Backport to 2.0.x
2012-01-13 09:54:34 -05:00
Gary Russell
52faf04469 INT-2347 Update Channel Mappings Atomically
Ensure consistent state if channel map is replaced
dynamically.

Backport to 2.0.x.
2012-01-03 11:21:53 -05:00
Mark Fisher
42f95faa61 INT-2335, INT-2336, INT-2337
upgraded spring framework dependency to 3.0.7.RELEASE

  upgraded spring security dependency to 3.0.7.RELEASE

  upgraded spring ws dependency to 2.0.3.RELEASE

  added exclusions for spring-ws transitive dependencies

  updated etag test for spring 3.0.7
2011-12-22 17:56:29 -05:00
Oleg Zhurakousky
0e791e38e9 INT-2331-maint fixed aggregator documentation
INT-2331-maint polishing
2011-12-22 08:54:42 -05:00
Mark Fisher
b660d816a0 INT-2291 polishing 2011-12-19 12:11:28 -05:00
Mark Fisher
da21487251 INT-2291 backported 2011-12-19 10:37:51 -05:00
Oleg Zhurakousky
820a1e138a INT-2295 fixed parser logic to eliminate STS warning
INT-2295 removed dead code
Object source = parserContext.extractSource(element); always returned NULL
2011-12-15 16:13:22 -05:00
Oleg Zhurakousky
09094b71aa INT-2291 polished test 2011-12-15 15:42:37 -05:00
Oleg Zhurakousky
bc2ca427bc INT-2291 fixed failing test 2011-12-01 13:13:13 -05:00
Oleg Zhurakousky
495cf53ac6 INT-2254 backporting to maint branch 2011-11-23 09:32:36 -05:00
Oleg Zhurakousky
58d41541d1 INT-2249
polished MethodInvokingMessageProcessor constructor that takes boolean argument by renaming the argument from 'requiresReply' to 'canProcessMessageList' which is what it really maps to in MessagingMethodInvokerHelper.HandlerMethod

  fixed 'filterSelectsNonVoidReturningMethodsOnly' and 'testOverloadedNonVoidReturningMethodsWithExactMatchForType' tests of MethodInvokingMessageProcessorTests to invoke the right constructor and commented out 'testVoidMethodsExcludedByFlag' test as its no longer valid
2011-11-23 08:11:54 -05:00
Gary Russell
eeeeed5c69 INT-2232 GCIBPP Don't Emit Stack Trace
Previously, a (DEBUG) stack trace was logged when we tried
to intercept NullChannel with a Global Channel Interceptor.
2011-11-23 07:53:18 -05:00
Oleg Zhurakousky
a0a09f7e66 backporting INT-2226 changes to maint branch 2011-11-10 15:00:57 -05:00
Mark Fisher
93a27b4ff1 fixed atomicity 2011-11-03 15:19:09 -04:00
Oleg Zhurakousky
c20f74c7e6 INT-1813
Added support for recognizing default components in parent ApplicationContext before they get auto-registered in child AC

Added containsBean check earlier, removed 'IfNecessary' from method names
2011-10-18 18:16:55 -04:00
Mark Fisher
2fd8f89463 PollerParser correctly prevents multiple triggers 2011-09-27 17:06:10 -04:00
Mark Fisher
7beaa19ea5 Backported INT-1947 and INT-1512 for core schema
LoggingHandler now has a loggerName property
  The <logging-channel-adapter> now has a 'logger-name' attribute
  changed xsd:ID types to xsd:string in spring-integration.xsd
2011-08-18 09:25:09 -04:00
Mark Fisher
9a43781973 updated POMs for 2.0.6.BUILD-SNAPSHOT 2011-07-18 18:09:12 -04:00
Mark Fisher
b1ee08b8d1 Release version 2.0.5.RELEASE 2011-07-18 17:36:31 -04:00
Mark Fisher
eb661d336c INT-1969 simplified PayloadTypeRouter code 2011-07-18 16:14:34 -04:00
Mark Fisher
7c9359e65f INT-1969 fixed some ambiguity tests 2011-07-18 15:50:43 -04:00
Oleg Zhurakousky
dda08a1b58 INT-1969 added even more tests for ambiguity checks 2011-07-18 14:04:21 -04:00
Oleg Zhurakousky
92f563f5e1 INT-1969 added more tests to validate several ambiguity scenarios for the PayloadTypeRouter 2011-07-18 13:58:26 -04:00
Oleg Zhurakousky
22bb8350b0 INT-1969 polished the code, modified exception message to include ambiguities 2011-07-18 12:58:47 -04:00
Mark Fisher
c92d877c24 INT-1969 ensuring that interface weight results are always odd to offset with even class results. Also fixed typo: 'matchedIntefaces' 2011-07-18 09:41:47 -04:00
Oleg Zhurakousky
f31aff1c27 INT-1969 polished PayloadTypeRouter support for determining the weight of sub-classes 2011-07-15 23:25:24 -04:00
Oleg Zhurakousky
4929fff7e5 INT-1978 added more tests for PayloadTypeRouter 2011-07-15 13:26:14 -04:00
Mark Fisher
7e4e58cddb INT-1969 adding type-difference-weight algorithm for more nuanced decision making with regard to class and/or interface hierarchies for the PayloadTypeRouter 2011-07-15 13:07:12 -04:00
Mark Fisher
cc56864c48 removing warnings 2011-07-15 11:48:08 -04:00
Mark Fisher
c856be6bcc formatting and removing unused method arg 2011-07-14 16:45:26 -04:00
Mark Fisher
2d72c278f9 polishing 2011-07-14 13:59:48 -04:00
Mark Fisher
ce3c538fb5 polishing 2011-07-14 13:49:10 -04:00
Mark Fisher
bd5bb7a101 removed System.out.println 2011-07-14 12:52:02 -04:00
Mark Fisher
1743347025 minor typo in xsd 2011-07-13 14:22:17 -04:00
Oleg Zhurakousky
f8acd850dc INT-1974 removed the IF statement which was checking the state of the collection in favor of delegating to the ConversionService 2011-07-13 12:37:06 -04:00
Mark Fisher
b99504ad96 INT-1972 remoting outbound gateway base class now must create a new message more explicitly 2011-07-12 18:19:43 -04:00
Mark Fisher
94ac56593f INT-1972 MessageBuilder is now more diligent in determining the 'modified' flag value, and as a result it will return the originalMessage from a build() call any time that there have been no additions/removals/modifications to the payload or headers. 2011-07-12 16:41:44 -04:00
Mark Fisher
5bffa91a1b INT-1932 added support for 'delimiters' attribute on the <splitter> element (when not using a 'ref', 'expression', or inner bean) 2011-07-12 14:14:24 -04:00
Oleg Zhurakousky
30b39da1d0 INT-1969 fixed typo and access modifier in PayloadTypeRouter 2011-07-11 18:20:06 -04:00
Oleg Zhurakousky
dc86782195 INT-1969 fixed PayloadTypeRouter to introspect sub-interfaces of the interfaces implemented by the payload type 2011-07-11 18:09:12 -04:00
Oleg Zhurakousky
16ebc11697 INT-1964 added DEBUG level logging to the doPoll() method in PollingConsumer and SourcePollingChannelAdapter 2011-07-08 09:54:55 -04:00
Oleg Zhurakousky
474783e263 INT-1777 added DEBUG level logging for SpEL Evaluation exception 2011-07-06 20:48:45 -04:00
Gary Russell
3b00de4202 INT-1957 Inner Poller Can Have default="true" 2011-07-01 17:57:05 -04:00
Oleg Zhurakousky
c00888f537 INT-1953 refactored CORE and HTTP modules to make them compatible with Spring v3.1 while maintaining the target version of 3.0.* 2011-06-24 15:20:32 -04:00