Commit Graph

6495 Commits

Author SHA1 Message Date
Oleg Zhurakousky
4e9d22eb7b INT-2516 Warn for Invalid request-payload-type
Issue initialization warning on inappropriate
request-payload-type attribute on Http Inbound Endpoint.
2012-06-07 11:16:37 -04:00
Gary Russell
956e7bcd0d Merge pull request #477 from olegz/INT-2518 2012-06-06 18:53:40 -04:00
Oleg Zhurakousky
c377b82d8a INT-2518 addressed Resequencer with custom comparator
removed setComparator(..) method from ResequencingMessageGroupProcessor, fixed tests. More details as to why are available in JIRA https://jira.springsource.org/browse/INT-2518
2012-06-06 10:08:05 -04:00
Oleg Zhurakousky
49960f3f36 Merge pull request #476 from garyrussell/INT-2264
* INT-2264:
  INT-2264, INT-2263 TCP GW Reconcile reply-timeout
2012-06-05 16:40:33 -04:00
Gary Russell
9f3e8aab4a INT-2264, INT-2263 TCP GW Reconcile reply-timeout
reply-timeout had the wrong function, when compared to
other gateways.

Add remote-timeout to reflect the time we will wait
for a reply from the remote system

Make reply-timeout set the sendTimeout on the messaging template

Set remore-timeout to reply-timeout (if set) unless remote-timeout
is explicitly set.

Update reference doc, and migration guide on Wiki.
2012-06-05 10:05:48 -04:00
Gary Russell
44e033a844 Merge pull request #475 from olegz/INT-2593 2012-06-04 18:32:02 -04:00
Oleg Zhurakousky
a1e59442d1 INT-2593 Upgrade to Spring WS 2.1.0
Upgrade spring-integration-ws to use Spring WS 2.1.0;
fix the deprecation warning in AbstractWebServiceOutboundGateway.encodeUri(..) method

INT-2593 polishing,
put deprecated code back in to ensure SPR 3.0 compatibility
2012-06-04 18:24:11 -04:00
Spring Buildmaster
9b69b38dbb 2012-06-04 05:19:06 -07:00
Spring Buildmaster
a0fc770a42 Release version 2.2.0.M2 2012-06-04 05:19:01 -07:00
Gary Russell
b90736c445 Merge pull request #474 from ghillert/INT-2601 2012-06-04 07:27:31 -04:00
Gunnar Hillert
5554ca3f47 INT-2601 Update the JPA Adapter Documentation
INT-2601 - Update the JPA Adapter Documentation

For reference see: https://jira.springsource.org/browse/INT-2601

INT-2601 - Doc Review - Fixes

INT-2601 - Add description for the *parameter-source-factory*

* Did some indention fixes (of sections)
2012-06-04 07:26:41 -04:00
Gary Russell
e335d2961f Merge pull request #465 from ghillert/INT-2582 2012-06-03 12:43:46 -04:00
Gunnar Hillert
94e5e45fd9 INT-2582 - Refactor JPA Outbound Gateway
* Split JPA Outbound Gateway into "updating-outbound-gateway" and "retrieving-outbound-gateway"
* INT-2573 Need a mechanism to have the max-number-of-results attribute for JPA outbound gateway and inbound adapters
* Cleanup
* Add more comments
* Add unit tests

For reference see: https://jira.springsource.org/browse/INT-2573

INT-2582 - Fixed comment + fixed spelling in assertion

INT-2582 - Throw MessagingException instead of MessageHandlingException

INT-2582 - Code review changes

* Changed bean naming strategy for jpaExecutor to `Id of JPA Component + ".jpaExecutor"`
* added tests
* changed `delete-per-row` XML attribute to `delete-in-batch`
* changed `deletePerRow` property in JpaExecutor to `deleteInBatch`
* delete-in-batch defaults to "false" to follow the default in Spring Data JPA
* fixed junit test
2012-06-03 12:42:47 -04:00
Gary Russell
d21b1f1316 Merge pull request #470 from ghillert/INT-2580 2012-06-01 16:25:56 -04:00
Gunnar Hillert
194a11983c INT-2580 Add Doc regarding Stored Procedure Name Expressions 2012-06-01 16:22:52 -04:00
Oleg Zhurakousky
3a26285b00 Merge pull request #472 from garyrussell/INT-2271
* INT-2271:
  INT-2271 - Add Dynamic Stored Proc Names (SpEL + Header) * Add support for Stored Procedure/Function Names via Message Header * Add support for Stored Procedure/Function Names via "stored-procedure-expression" parameter * Add support for cacheable *SimpleJdbcCallOperation* instances * Add Guava dependency for Cache Support * Convert white-spaces to tabs (where occurring) * Convert line-delimiters to Linux format (where occurring)
2012-06-01 15:14:04 -04:00
Gunnar Hillert
7a5b49275f INT-2271 - Add Dynamic Stored Proc Names (SpEL + Header)
* Add support for Stored Procedure/Function Names via Message Header
* Add support for Stored Procedure/Function Names via "stored-procedure-expression" parameter
* Add support for cacheable *SimpleJdbcCallOperation* instances
* Add Guava dependency for Cache Support
* Convert white-spaces to tabs (where occurring)
* Convert line-delimiters to Linux format (where occurring)

For reference see: https://jira.springsource.org/browse/INT-2271

INT-2271 - Expose Cache Stats via JMX
This includes the implementation of INT-2584 - Instantiate the StoredProcExecutor as a Spring Managed Bean for each Stored Procedure Component

INT-2271 Made DataSource final in StoredProcExecutor

INT-2271 - Code Review Changes

INT-2271 Code Review Fixes
* remove attribute *allowDynamicStoredProcedureNames*
* remove JDBC Headers

INT-2271 Polishing

Use LiteralExpression when a simple stored procedure
name is supplied.
2012-06-01 15:13:05 -04:00
Oleg Zhurakousky
0646df3657 Merge pull request #463 from garyrussell/INT-2592
* INT-2592:
  INT-2592 Fix Memory Leak in SimpleMessageStore
2012-06-01 13:15:22 -04:00
Gary Russell
e053932c5c INT-2592 Fix Memory Leak in SimpleMessageStore
Locks used to control access to a group of messages were
never removed from the collection.

Converted to use LockRegistry, which (by default) uses
a pool of reentrant locks, using the hashcode of the group id
as an index into the pool.

Given that the pool is fixed, there is nothing to remove, thus
avoiding the memory leak.

When used within AbstractCorrelatingMessageHandler, any
custom LockRegistry supplied will also be used by the message
store, thus allowing the user to increase or decrease the
size of the lock pool. The registry can not be changed
once the SimpleMessageGroup has been used.

Also, the ACMH had some protection to avoid setting the
LockRegistry more than once, but this did not protect
against the default lock registry being replaced after
it had been used. Added additional protection to avoid
this condition by setting lockRegistrySet to true in
onInit().

INT-2592 Polishing

PR Comments. Now, if a custom lock registry is required, it
must be supplied to both the ACMH and SMS.

INT-2592 polishing, fixed Javadoc in SMS
2012-06-01 13:09:43 -04:00
Gary Russell
4bc8760012 Merge pull request #468 from olegz/INT-2397 2012-06-01 12:31:44 -04:00
Oleg Zhurakousky
b105872bb7 INT-2397 http-method-expression
Add support for http-method-expression attribute to the HTTP Outbound Gateway/Adapter

INT-2397 polishing

INT-2397 polishing based on PR comments

INT-2397 more polishing based on PR comments

INT-2397 polishing

INT-2397 plishing PR comments

INT-2397 polishing
2012-06-01 12:29:40 -04:00
Oleg Zhurakousky
a011f9dda7 Merge pull request #456 from garyrussell/INT-2419
* INT-2419:
  INT-2419 Thread Starvation Detection
2012-06-01 12:14:17 -04:00
Gary Russell
90fe92ae29 INT-2419 Thread Starvation Detection
Previously, it was possible to run out of threads in
a fixed thread pool, and this could cause an indefinite
deadlock.

With this change, the deadlock is detected causing the
current message to fail, but freeing up the stuck
threads.

This was only seen with very small thread pools but
the potential was there for the condition to occur
under extreme conditions.

INT-2419 Deprecate poolSize Property

INT-2419 Polishing

Add note about OOM possibility now that an
unbounded task executor is used by default.
2012-06-01 12:08:43 -04:00
Gary Russell
01225b8a48 Merge pull request #469 from olegz/INT-2318 2012-06-01 12:00:24 -04:00
Oleg Zhurakousky
835d8ff77a INT-2318
removed pre-initialization of MBeanExporter form IntegrationMBeanExporter since its no longer required
2012-06-01 11:52:19 -04:00
Oleg Zhurakousky
4e5319ac35 Merge pull request #446 from artembilan/INT-2567
* INT-2567:
  INT-2567: Improvement & refactor Groovy component
2012-06-01 11:01:25 -04:00
Artem Bilan
74b4638eb9 INT-2567: Improvement & refactor Groovy component
Introduce VariableResolver, BeanFilter, FilteredBeanFactoryDecorator, GroovyVariableResolverBinding, refactoring ManagedBeansScriptVariableGenerator for usage GroovyVariableResolverBinding.
GroovyVariableResolverBindingTests.
additional tests for GroovyControlBus.
add 'spring-web' dependency for tests about 'request' custom scope.
Manual: change description about 'Groovy Control Bus' scripts limitation'.

INT-2567: Improve & refacror Groovy Control Bus

Introduce separate BindingOverwriteGroovyObjectCustomizerDecorator
Internal GroovyControlBusFactoryBean$ManagedBeansBinding with delegation to provided BeanFactory
Inline ScriptVariableGenerator implementation just for Message 'headers' variable
Tests for new GroovyScriptPayloadMessageProcessor logic about binding
Integration tests for managed beans in the custom scope
Reference Manual: polishing description about Control Bus' behavior

INT-2567 polishing added @link to javadocs
2012-06-01 10:59:39 -04:00
Mark Fisher
5750c69142 Merge pull request #464 from garyrussell/INT-2591
INT-2591 Upgrade spring-amqp to 1.1.1.RELEASE
2012-05-31 21:25:07 -04:00
Gary Russell
d06154bdbc INT-2591 Upgrade spring-amqp to 1.1.1.RELEASE 2012-05-31 15:03:51 -04:00
Gary Russell
c1f5c51550 Merge pull request #451 from amolnayak311/INT-2571 2012-05-30 16:50:12 -04:00
Amol Nayak
190b8e33bb INT-2571 make use of use-payload-as-parameter-source in JPAExecutor
INT-2571: Suggested changes made and added an additional test case

INT-2571: Fix the javadoc generation warning in the class

INT-2571 Polishing

Factor out common code into determineParamterSource()
2012-05-30 16:49:28 -04:00
Oleg Zhurakousky
a2cf6f85fa Merge pull request #462 from garyrussell/INT-2588
* INT-2588:
  INT-2588 Remove Deprecation
2012-05-25 15:33:46 -04:00
Gary Russell
fcd3771c17 INT-2588 Remove Deprecation
@ExpectedException is deprecated.

Also fixes a sporadic timing issue in the client mode test;
the default retry interval is 60 seconds and we only wait
10 seconds for the connection. If the initial connection
fails, we don't retry before the timeout.

INT-2527 Remove Event Deprecation

@Test @ExpectedException... -> @Test(expected...
2012-05-25 15:30:24 -04:00
Gary Russell
e828264867 Merge pull request #455 from amolnayak311/INT-2572 2012-05-25 13:39:31 -04:00
Amol Nayak
100741b354 INT-2572 Use the reply-timeout attribute in outbound gateway parser 2012-05-25 13:35:12 -04:00
Oleg Zhurakousky
020a8bf1e0 Merge pull request #460 from garyrussell/INT-2448
* INT-2448:
  INT-2448 Add view-expression to Http Inbound
2012-05-25 12:36:18 -04:00
Gary Russell
733e0ead45 INT-2448 Add view-expression to Http Inbound
https://jira.springsource.org/browse/INT-2488

Previously the view name could be specified; with this
change, either the view name or a view-epression can be
provided, with the reply message being the root object
of the evaluation context.

INT-2448 Polishing

Remove deprecation from view-name.

Reuse evaluation context.

INT-2448 Polishing

PR Comments
2012-05-25 12:35:18 -04:00
Oleg Zhurakousky
72f5a26682 Merge pull request #461 from garyrussell/INT-2570 fixing failing tests
* INT-2570b:
  INT-2570 Fix Failing Tests
2012-05-25 12:31:28 -04:00
Gary Russell
a4eb5a981b INT-2570 Fix Failing Tests
Renamed field from uri to uriExpression and it now
contains an expression.

DirectFieldAccessor in tests failed.
2012-05-25 12:22:52 -04:00
Oleg Zhurakousky
bb16381210 Merge pull request #459 from garyrussell/INT-2570
* INT-2570a:
  INT-2570 Support url-expression on Outbound Http
2012-05-25 12:02:40 -04:00
Gary Russell
51562d1783 INT-2570 Support url-expression on Outbound Http
Add url-expression as an alternative to url for outbound
http adapters. One of url or url-expression must be
provided (but not both).

The Message is the root object for the expression's
evaluation context; the bean factory can also be
used to resolve '@beanName' expressions.

INT-2570 url-expression Reference Docs

Add note to the reference guide.

INT-2570 Polishing

PR Review Comments

INT-2570 Polishing

PR Review comments.
2012-05-25 12:01:45 -04:00
Gary Russell
44e3ae276d Merge pull request #450 from amolnayak311/INT-2440 2012-05-23 16:23:32 -04:00
Amol Nayak
b9d73f06fa INT-2440: Update the reference documentation for the JPA adapter chapter in the manual.
INT-2440 Polishing (JPA Doc)
2012-05-23 16:21:28 -04:00
Oleg Zhurakousky
f060a714a4 Merge pull request #454 from garyrussell/INT-2581
* INT-2581:
  INT-2581 Fix Failing Test (Timing)
2012-05-23 13:45:00 -04:00
Gary Russell
33c0da2341 INT-2581 Fix Failing Test (Timing)
When sending a message to the server, we checked that the
user hook for the socket creation was called. However,
it was possible (likely) that we tested the counter before
the socket actually opened.
2012-05-23 13:11:34 -04:00
Oleg Zhurakousky
73164ff82a Merge pull request #444 from garyrussell/INT-2153
* INT-2153:
  INT-2153 SSL Support
2012-05-23 12:46:21 -04:00
Gary Russell
5c0c55409b INT-2153 SSL Support
Add strategy interfaces
 - obtaining ServerSocketFactory and SocketFactory
 - post processing ServerSockets and Sockets
 - obtaining initialized SSLContext

Provide SSL and non-SSL implementations of the strategies, to
serve up the appropriate socket factories, and do nothing in the
post processing methods.

The postprocessors allow the user to modify sockets after
configured attributes have been applied but before the sockets
are used.

This is particularly useful with SSL in case additional SSL
options need to be applied.

Docs

Polishing JavaDocs

Polishing

Javadocs, polishing

Polishing

Polishing

INT-2153 Polishing

PR Review

White Space

INT-2513 Polishing

Fixed method names.
2012-05-23 12:45:24 -04:00
Gary Russell
7d914d64bd Merge pull request #449 from ghillert/INT-2558 2012-05-21 13:39:15 -04:00
Gunnar Hillert
e996c091d3 INT-2558 - JPA: remove SI version on the XSD URLs in the test contexts
For reference see: https://jira.springsource.org/browse/INT-2558
2012-05-21 13:25:41 -04:00
Gary Russell
e1c4281290 Merge pull request #442 from olegz/INT-2544b 2012-05-21 11:51:12 -04:00