Commit Graph

7134 Commits

Author SHA1 Message Date
Artem Bilan
ff56a31cd3 INT-3108: add requires-reply for s-a within chain
`<service-activator>` has had an attribute `requires-reply`,
but it wasn't available within `chain`.
Introduce new XSD type `serviceActivatorType`
and use it for root `<service-activator>` element and within `<chain>` as well.

JIRA: https://jira.springsource.org/browse/INT-3108
2013-08-08 12:15:44 +03:00
Gary Russell
9f3eba1f0a INT-3061 Update Reference Copyright 2013-08-07 18:55:45 -04:00
Gunnar Hillert
88926dd3b8 Fix link in CONTRIBUTING.md 2013-08-02 13:59:26 -04:00
Gunnar Hillert
c5e0fee3f5 Update CONTRIBUTING.md
Add more information from the Spring Framework document on maintaining a linear history as well as some code-style information
2013-08-02 13:56:45 -04:00
Gunnar Hillert
e00c112e57 Merge pull request #832 from garyrussell/INT-3089
* garyrussell-INT-3089:
  INT-3089 Fix FileExistsMode.IGNORE
2013-07-16 13:59:47 -04:00
Gary Russell
f031867e16 INT-3089 Fix FileExistsMode.IGNORE
When writing files with this mode setting, the FWMH detected
that the final file already exists, but did not detect that
the temporary (default ....writing) file exists. This could
happen if two adapters were simulataneously processing the same
file.

Also, while a comment in the setter said an empty temp file
suffix is allowed, it did not work because the file rename
is performed unconditionally, fails, and throws an exception.

Add a check for the temporary file (if the suffix is not "").

Don't rename if the file was written in-place (no temp file suffix).

Add test cases for the FileExistsMode.IGNORE for both the final
and temporary files. Add a test where the temporary file suffix
is "", a ...writing file exists, the final file does not exist
and so is created by the handler. The ...writing file is untouched.
2013-07-16 09:43:33 -04:00
Gunnar Hillert
a203b652c9 Merge pull request #805 from artembilan/INT-2865
* artembilan-INT-2865:
  INT-2865: Stored Procedure SqlReturnType support
2013-07-15 00:37:00 -04:00
Artem Bilan
7d96dc7969 INT-2865: Stored Procedure SqlReturnType support
JIRA: https://jira.springsource.org/browse/INT-2865
2013-07-15 00:35:53 -04:00
Gary Russell
3154173d23 INT-3066 Fix NPE During Connection Recovery
The JmsOutboundGateway's Listener container could throw
an NPE during connection recovery - while logging recovery
status.

The log attempts to include the destination description which
throws the NPE if there is no destination yet established.

Only attempt to get the description if the destination has
been established. And, even then, use a try/catch block
to prevent the NPE. Log the destination as 'null' in this
case.

Add a test case to detect the NPE by adding an ErrorHandlingTaskExecutor.

No errors should be detected with the fix in place.
2013-07-12 16:19:15 -04:00
Gary Russell
5506a55670 INT-3083 Update Spring Data Redis to 1.0.5
INT-3080 Invoke RedisTemplate.afterPropertiesSet() when instantiating
programmatically.

INT-3084 Redis channel was incorrectly calling discard() during stop() (a multi-operation).
INT-3084 Fix timing issue in test (NPE)
2013-07-12 15:47:07 -04:00
Gary Russell
381c0be71e INT-3086 Update Spring-AMQP to 1.2.0.RELEASE 2013-07-12 14:43:53 -04:00
Gary Russell
5cff151763 Merge pull request #817 from alighm/INT-2990
* INT-2990:
  INT-2990 Remove System.out in PipelineJmsTests
2013-07-01 07:03:07 +01:00
Ali Moghadam
dd987f4edb INT-2990 Remove System.out in PipelineJmsTests
Polishing: Make logger final; add log of test config;
same change in PipelineNamedReplyQueuesJmsTests; author
credit.
2013-07-01 06:59:02 +01:00
Gary Russell
c129a02e6c INT-2721 Increase Timers on JDBC Delayer Tests
Still fail when the build server is under heavy load.
2013-06-11 18:28:23 +01:00
Gary Russell
14e556ce23 INT-2620 Fix Debug Log
New connection debug log should include this.getConnectionId() instead
of this.toString().

Noticed during backport to 2.2.x.
2013-06-11 16:40:58 +01:00
Gary Russell
af35733b20 Merge pull request #814 from willschipp/INT-3037
* INT-3037:
  INT-3037 Fix JDBC MS Discard After Completion
2013-06-10 13:12:39 +01:00
willschipp
6140aa7b2c INT-3037 Fix JDBC MS Discard After Completion
INT-3037 - commented out sizing component

unit test to support

cleanup

updated commit as per Artem's comments May 29
2013-06-10 13:11:39 +01:00
Mark Fisher
077f2b24ea Update Spring Social Twitter to 1.0.5 2013-06-10 07:48:08 -04:00
Mark Fisher
cc5bcf64a6 Merge pull request #819 from garyrussell/INT-3053
* INT-3053: Allow task-executor on <reply-listener/>
2013-06-09 20:37:46 -04:00
Gary Russell
6d4f2b46d8 INT-3053 Allow task-executor on <reply-listener/>
JMS Outbound Gateway did not allow the specification of
a task executor on the <reply-listener/> element.

This could prevent the gateway being used with a
listener in a JEE container.

Allow setting a task-executor.

Add a bean name to the reply listener container so
that a default TE will create suitably named threads.

INT-3053 Polishing

Fix container bean name when the gateway has no
bean name.
2013-06-09 18:23:26 +01:00
Mark Fisher
1a27d81941 Merge pull request #816 from habuma
# By Craig Walls
* twitter-api-retire:
  Update Spring Social Twitter version to 1.0.4
2013-06-07 18:19:56 -04:00
Craig Walls
56f9581b85 Update Spring Social Twitter version to 1.0.4
(Refactor) Use SearchParameters for searching Twitter
2013-06-07 18:17:35 -04:00
Mark Fisher
0913ff3607 Merge pull request #818 from garyrussell/INT-3031
* INT-3031: Fix RMI Remote Failed Message
2013-06-07 16:24:04 -04:00
Gary Russell
8fe5d44d03 INT-3031 Fix RMI Remote Failed Message
When a remote flow throws a `MessagingException`, it is unwrapped
and the local `failedMessage` property is the remote failed
message instead of the message that arrived at the outbound
gateway.

Detect a remote MessagingException and wrapt it in a new
MessagingException so the `failedMessage` property is the
original message and the `failedMessage` on the cause is
the remote failed message.
2013-06-06 13:07:38 -04:00
Mark Fisher
0c3eaaa3b5 Merge pull request #812 from garyrussell/INT-3035
* INT-3035: Fix ExponentialMovingAverageRate 'window'
2013-06-06 11:39:42 -04:00
Gary Russell
50e728f9e0 INT-3035 Fix ExponentialMovingAverageRate 'window'
'window' constructor arg was not used.

Add test.
2013-06-06 11:37:30 -04:00
Gunnar Hillert
91afaedbe2 Merge pull request #815 from artembilan/INT-2993
* artembilan-INT-2993:
  INT-2993: JCMStore: fix 'idCache' race condition
2013-06-06 09:55:27 -04:00
Artem Bilan
a76921d70b INT-2993: JCMStore: fix 'idCache' race condition
Previously there was a concurrency race condition, where
`parameters` with `idCache` for poll Messages query had one state on building phase,
but had another one on execution phase.

* Introduce `ReentrantReadWriteLock` `idCacheLock` for operation around `idCache`
* Change `idCache` to simple `HashSet`, because thread-safety is guaranteed by `idCacheLock`
* Add a concurrency test-case, which failed before fix

JIRA: https://jira.springsource.org/browse/INT-2993
2013-06-05 18:01:45 +03:00
Gary Russell
22ed24c941 Revert version to 3.0.0.BUILD-SNAPSHOT 2013-05-24 11:26:42 -04:00
Spring Buildmaster
8e56fbe00c [artifactory-release] Release version 3.0.0.M2 2013-05-23 10:14:11 -07:00
Mark Fisher
b64a43cc0e Merge pull request #760 from garyrussell/INT-2938
# By Gary Russell
* INT-2938:
  INT-2938 Filter - Provide Option for Discard
2013-05-23 12:08:34 -04:00
Gary Russell
d1d367a97f INT-2938 Filter - Provide Option for Discard
Provide an option to determine whether or not the discard
(and exception throwing if configured) occurs within the
advice chain (default), or after it completes.

INT-2938 Filter Discard Advice Option - Schema

Schema, parser, tests for option on filter element.

INT-2938 Polishing - PR Comments + Doc

INT-2938 Add to "What's New"

INT-2938 Polishing - Javadoc Typo

while merging: simplified to use boolean var only
2013-05-23 12:07:26 -04:00
Gary Russell
2bf6b9ba14 Merge pull request #808 from artembilan/INT-3022
* INT-3022:
  INT-3022: SimpleResponseMessageExtractor NPE fix
2013-05-23 11:33:53 -04:00
Artem Bilan
406dd39bfb INT-3022: SimpleResponseMessageExtractor NPE fix
https://jira.springsource.org/browse/INT-3022
2013-05-23 11:20:27 -04:00
Gary Russell
564956de86 Merge pull request #806 from ghillert/INT-3021
* INT-3021:
  INT-3021 - Fix Sonar Build Plan
2013-05-23 10:43:13 -04:00
Gunnar Hillert
955e3ee282 INT-3021 - Fix Sonar Build Plan
* Upgrade to gradle 1.6
* Switch from sonar plugin to sonarRunner plugin

INT-3021 - Correct SCM syntax
2013-05-23 10:42:37 -04:00
Gunnar Hillert
d649a9f542 Merge pull request #810 from garyrussell/INT-3028
* garyrussell-INT-3028:
  INT-3028 Fix Tailing Factory Bean
2013-05-22 15:05:28 -04:00
Gary Russell
2857e7809c INT-3028 Fix Tailing Factory Bean
- Needs to implement SmartLifecycle and delegate to the adapter
 - Needs to implement ApplicationEventPublisherAware and configure the adapter
 - Don't set TaskExecutor if null
2013-05-22 14:19:43 -04:00
Gary Russell
2298809ac9 INT-2855 Fix commons-io Dependency
Even when using native tail, there is a dependency on
commons-io due to the factory bean.
2013-05-22 13:09:06 -04:00
Gunnar Hillert
3176cbaf34 Merge pull request #758 from garyrussell/INT-2951
* garyrussell-INT-2951:
  INT-2951 Add Context Id to Dispatcher has no Subs.
2013-05-22 12:58:45 -04:00
Gary Russell
b904fde5c0 INT-2951 Add Context Id to Dispatcher has no Subs.
https://jira.springsource.org/browse/INT-2951

Provide the context id in the 'Dispatcher has no Subscribers'
message.

Ease debugging when more than one context in an application.

INT-2951 Polishing

PR Comments - add quotes to context Id in log message.

Polishing

INT-2951 Polishing

Change IOS to have a simple getApplicationContextId() and
add a method getFullChannelName() to AbstractMessageChannel.
2013-05-22 12:57:20 -04:00
Mark Fisher
e255399415 Merge pull request #809 from garyrussell/INT-3026
* INT-3026: Header Enrichment Using Gateways
2013-05-21 15:07:46 -04:00
Gary Russell
fe3e4a26db INT-3026 Header Enrichment Using Gateways
Add link to wiki page to reference doc.
2013-05-21 14:53:47 -04:00
Gary Russell
fa9f747c37 Merge pull request #753 from srt/INT-2755
* INT-2755:
  INT-2755: Support 'id' For <chain> Child Elements
2013-05-21 12:29:31 -04:00
Artem Bilan
ecf15a9834 INT-2755: Support 'id' For <chain> Child Elements
* Introduce XSD 'id' attribute for all `<chain>` sub-components
* Register `<chain>` sub-components as Beans with names based on `<chain>` 'id'
* Generate aliases for sub-components based on element 'id'
* Add `<chain>` parser test to check sub-components as Beans within `BeanFactory`
* Ignore `NestedChainParserTests` as abnormal and confused for SI-configs
* Now `<chain>` sub-components are trackable by `MessageHistory`
* Now `<chain>` sub-components are eligible for JMX export
* Polishing some failed tests

https://jira.springsource.org/browse/INT-2755
https://jira.springsource.org/browse/INT-2321

INT-2755: Register as Beans only if 'id' provided

INT-2755: Set 'componentName' for handlers with 'id'

When components within `<chain>` are configured with an 'id' attribute
the 'componentName' of the handler is  constructed as:
chainHandler.componentName + '.' + handler.componentName.
Otherwise it is as was before.

INT-2755: Polishing

INT-2755: changes according PR's comments

* Add INFO about preference of `id` attribute for `<chain>` in the `ChainParser`
* Change `<chain>`'s sub-components `id` generation algorithm
* Configure `<chain>`'s sub-component `componentName` in the `ChainParser` instead of in the `MessageHandlerChain`
* Add `componentName` property to the `JpaOutboundGatewayFactoryBean`
* Add a note to the Reference Manual

INT-2755: Localize duplicate 'id' within chain

INT-2755: remove child beans aliasing

* Polishing tests
* Polishing docs

INT-2755 Polishing: Handle Nested Chain Bean Names

Previously named beans within a nested chain did not get unique
bean names.

INT-2755: Polishing nested chains

Doc Polishing
2013-05-21 12:26:27 -04:00
Gary Russell
ccf7492097 INT-2855 Fix Tail Test on Build Server
- Fix tail test
 - Fix 2 javadoc issues
2013-05-20 21:58:57 -04:00
Gary Russell
20d7c30fd0 Merge pull request #803 from srt/INT-3011
* INT-3011:
  INT-3011 Groovy Classloader and BeanFactory Fixes
2013-05-20 17:50:02 -04:00
Stefan Reuter
e890020a1b INT-3011 Groovy Classloader and BeanFactory Fixes
See: https://jira.springsource.org/browse/INT-3011

INT-3011 Pass BeanClassLoader and BeanFactory to GroovyScriptFactory

INT-3011 Move 'implements BeanFactoryAware, BeanClassLoaderAware'
to AbstractScriptExecutingMessageProcessor and GroovyControlBusFactory
2013-05-20 17:46:48 -04:00
Gunnar Hillert
1f9c6e39b6 Merge pull request #802 from garyrussell/INT-2855
* garyrussell-INT-2855:
  INT-2855 File Tailing Inbound Channel Adapter
2013-05-20 11:21:07 -04:00
Gary Russell
f2fef2a7e9 INT-2855 File Tailing Inbound Channel Adapter
Two implementations:

  - native 'tail' command (e.g. tail -F -n 0 /foo/bar)
  - Apache commons-io Tailer

Further changes:

 - Add documentation to section "what's new"
 - Add a JUnit @Rule so the OSDFTMP test doesn't fail on Windows
2013-05-20 11:16:00 -04:00