Commit Graph

7448 Commits

Author SHA1 Message Date
Oleg Zhurakousky
c16684a4c2 Merge pull request #603 from garyrussell/INT-2603
* INT-2603:
  INT-2603 Fix TCP Shutdown Delay
2012-09-05 11:49:37 -04:00
Gary Russell
462493431e INT-2603 Fix TCP Shutdown Delay
A taskExecutor thread could deadlock in getTaskExector() if
stop() is attempting to shut down the task executor.

This could delay the stop by up to 20 seconds.

Move the if(isActive) test outside of the synchronized
block.
2012-09-05 11:48:44 -04:00
Mark Fisher
a5b090facc Merge pull request #605 from garyrussell/INT-2730
INT-2730 Move OrderlyShutDownAware Interface
2012-08-31 18:20:35 -04:00
Gary Russell
273bba370b INT-2730 Move OrderlyShutDownAware Interface
Move from core to context.
2012-08-31 17:57:33 -04:00
Mark Fisher
ffe4a449ac Merge pull request #606 from olegz/INT-2729
INT-2729 Redis Outbound Adapter
2012-08-31 17:49:53 -04:00
Oleg Zhurakousky
988f925368 INT-2729 Redis Outbound Adapter
exposed setters for RedisSerializers, modified namespace, added tests

  added missing test file

  polished log messages

  polishing and whitespace
2012-08-31 17:47:54 -04:00
Mark Fisher
bcdc0c15aa typo 2012-08-31 09:54:10 -04:00
Gary Russell
7507401dea Merge pull request #600 from ghillert/INT-2524 2012-08-30 16:40:02 -04:00
Gunnar Hillert
4c77b7c93b INT-2524 - Don't Map Transfer-Encoding Header
For reference see: https://jira.springsource.org/browse/INT-2524

INT-2524 - Add some more tests
2012-08-30 16:39:11 -04:00
Gunnar Hillert
3c15f376db Merge pull request #598 from garyrussell/INT-2715
* garyrussell-INT-2715:
  INT-2715 Update spring-amqp Dependency to 1.1.2
2012-08-29 14:15:08 -04:00
Gary Russell
caa9a8bfd1 INT-2715 Update spring-amqp Dependency to 1.1.2
spring-amqp-1.1.2.RELEASE
2012-08-29 14:14:53 -04:00
Gunnar Hillert
3bd9270d39 Merge pull request #599 from garyrussell/INT-2716
* garyrussell-INT-2716:
  INT-2716 Fix Javadoc Warnings
2012-08-29 14:12:24 -04:00
Gary Russell
92959b3e06 INT-2716 Fix Javadoc Warnings 2012-08-29 14:07:17 -04:00
Gary Russell
6be155fbc5 Merge pull request #594 from ghillert/INT-2710 2012-08-29 11:39:43 -04:00
Gunnar Hillert
dad4eac9ac INT-2710 - Remove hard-coded schema references
For reference see: https://jira.springsource.org/browse/INT-2710
2012-08-28 17:08:43 -04:00
Gary Russell
35ccb61b31 Merge pull request #593 from artembilan/INT-2722 2012-08-28 17:00:17 -04:00
Artem Bilan
600a347652 INT-2722: Document Delayer's <advice-chain>
* describe delayer's `<transactional>` & `<advice-chain>` abilities
* polishing delayer's doc: it looks bad in the PDF
* fix typo for 'proxying'

JIRA: https://jira.springsource.org/browse/INT-2722

INT-2722: Polishing - PR comments
2012-08-28 16:59:47 -04:00
Gary Russell
0345a381b2 Merge pull request #591 from artembilan/INT-2717 2012-08-28 09:21:12 -04:00
Artem Bilan
2607b7a877 INT-2717: add 'view-expression' to <http:I-C-A>
* XSD: add 'view-expression' attribute to the http:inbound-channel-adapter since `HttpRequestHandlingController` supports it.
* Parser test for 'view-expression' attribute

JIRA: https://jira.springsource.org/browse/INT-2717

INT-2717: Polishing based on PR comments

Polishing - add mutual exlusivity to schema doc.
2012-08-28 09:19:16 -04:00
Spring Buildmaster
0927078f33 2012-08-22 08:32:18 -07:00
Spring Buildmaster
653ad5f8f8 [artifactory-release] Release version 2.2.0.M4 2012-08-22 08:32:11 -07:00
Gary Russell
f3f81930f7 Merge pull request #590 from olegz/INT-2612b 2012-08-22 10:41:37 -04:00
Oleg Zhurakousky
bd51b3ee7a INT-2612 Add MongoDb Adapters
Initial support for MongoDb adapters
based on initial work done by Amol Nayak

INT-2612b Add namespace support
Add entityClass and expectSingleResult attribiutes to MongoDbMessageSource

INT-2612 Polishing

Mostly JavaDocs and a few asserts; plus renamed mongodb-template to
mongo-template.

INT-2612 Remove 'store-' Prefix from Elements

INT-2612 Polish Tests

Add tests for mongo-converter pass and fail when template present

INT-2612 Add missing files

INT-2612 Polishing

INT-2612 Add @MongoDbAvailable to parser tests

INT-2612b Add dedicated parser tests
2012-08-22 10:38:46 -04:00
Oleg Zhurakousky
a333d33112 Revert "INT-2683, INT-2684 JmsOutboundGateway improvements"
This reverts commit f127dc2d34.
2012-08-21 11:28:13 -04:00
Oleg Zhurakousky
bfac7999cd Merge pull request #584 from garyrussell/INT-2683
* INT-2683:
  INT-2683, INT-2684 JmsOutboundGateway improvements Added support for caching reply consumers when reply queue is Temporary Queue Added support for reuse of temporary Reply queues in the JmsOutboundGateway
2012-08-17 17:10:59 -04:00
Oleg Zhurakousky
f127dc2d34 INT-2683, INT-2684 JmsOutboundGateway improvements
Added support for caching reply consumers when reply queue is Temporary Queue
Added support for reuse of temporary Reply queues in the JmsOutboundGateway

Added check in ChannelPublishingJmsMessageListener to catch IllegalAccessExceptions
when Session is closed

INT-2683 first round of PR coomments

INT-2683 polish

INT-2683 polishing
code restructuring, other optimizations

INT-2683 modified 'messageCorrelationId' generation logic to be the object identity of the jmsReques as its 3-4 times fatster then String.valueOf(System.currentTimeMillis() +
-                String.valueOf(System.nanoTime())

INT-2683
polished JOG to ensure that it properly manages the correlation id when used in the pipeline
added various combinations of pipeline tests

INT-2683 added copyrights to tests

INT-2683 polishing

INT-2683 polishing

INT-2683 added more pipeline tests

INT-2683 added more tests

INT-2683 polishing test

INT-2683 Polishing

INT-2683 More Pipeline Tests

INT-2683 Don't Propagate CorrelationID

Message correlation is internal to the JOG. Cannot
propagate an existing correlation id because some
downstream JOG may end up correlating (selecting) on
the same key.

INT-2683 Polishing

Fix whitespace - replace spaces with tabs.

INT-2683 polishing
reverted 2.1 schema back to its master state, fixed the typo in the test
2012-08-17 17:09:21 -04:00
Oleg Zhurakousky
1f59577281 Merge pull request #589 from garyrussell/INT-2702
* INT-2702:
  INT-2702 Mail ThreadLocal Polishing
2012-08-16 08:18:08 -04:00
Gary Russell
0da9baf26d INT-2702 Mail ThreadLocal Polishing
Change set(null) to remove()

Eliminate folder close from destroy() method. It no longer makes
sense to do that there.
2012-08-16 08:17:02 -04:00
Gary Russell
1edac11fba Merge pull request #588 from olegz/INT-2713 2012-08-15 19:29:26 -04:00
Oleg Zhurakousky
6528574c7e INT-2713 AMQP Content-Type Mapping
Adjusted DefaultAmqpHeaderMapper to recognize and convert Content-Type
to String if the incoming Content-Type headers is of type
org.springframework.http.MediaType.

INT-2713 polishing
2012-08-15 18:51:31 -04:00
Gary Russell
de5506daf3 Merge pull request #577 from olegz/INT-2637c 2012-08-15 15:08:09 -04:00
Oleg Zhurakousky
e2039789c0 INT-2637 Add Redis Store Outbound Adapters
INT-2637 added initial support for Redis store outbound adapters

INT-2637 polishing, squashing and rebasing with master

INT-2637
Rename parsePayload to storePayloadAsSingleValue and modify its schema counterpart,
Address other PR comments

INT-2637
Modify the parse-payload attribute to extract-payload-elements with default value 'true', update schema and tests

INT-2637 polish

INT-2637 Polishing

Tidy up Javadocs, Schema.

Add map-key-expression for MAP and PROPERTIES CollectionType

INT-2637 Polishing
2012-08-15 14:48:13 -04:00
Gary Russell
a2b0c3b508 Merge pull request #586 from olegz/INT-2626b 2012-08-14 15:40:34 -04:00
Oleg Zhurakousky
246a202661 INT-2626 Fix RLR parser
Fix RecipientListRouterParser to extend
from AbstractRouterParser, thus eliminating
the problem described in INT-2626.

Previously, the router was a top level bean and, since
it is an @ManagedResource, the mbean exporter eagerly
instantiated it (and its Recipients) before the
ChannelInitializer ran.

Now, it is an anonymous inner bean inside a FB,
so the exporter no longer "finds" it,
thus deferring the Recipient instantiation
until the router itself is instantiated via its FB,
which will be after the C.I. runs.

This is all fine, with one caveat - previously the RLR
is made available as an MBean - now it is not,
unless you ALSO add the int-jmx:mbean-exporter.

However, the MBean is very basic, with no attributes and
a single operation 'setShouldTrack()', so the risk is
extremely low and the workaround is to add the
IntegrationMBeanExporter.

INT-2626 polished based on PR comments
2012-08-14 15:21:20 -04:00
Gary Russell
2a04ee0806 Merge pull request #587 from olegz/INT-2712 2012-08-14 15:03:13 -04:00
Oleg Zhurakousky
569f2f3d56 INT-2712 Fix HttpREMHandler ConversionService
Fix initialization of the ConversionService logic
in HttpRequestExecutingMessageHandler to NOT throw an exception if
ConversionService is not an instance of ConfigurableConversionService

Fix previous commit to be compatible with Spring 3.0,
by dependiing on ConverterRegistry instead of
ConfigurableConversionService, which was introduced in Spring 3.1
2012-08-14 14:55:09 -04:00
Oleg Zhurakousky
a544ef08b3 Merge pull request #585 from garyrussell/INT-2711
* INT-2711:
  INT-2711 syslog Transformer
2012-08-14 14:16:13 -04:00
Gary Russell
f8782f3dc9 INT-2711 syslog Transformer
Initial Implementation; UDP test.

syslog - Add TCP Test

Add single byte terminating deserializer and a
subclass that terminates on LF (syslog uses
LF terminator).

Move to Core

Allow for transport of undecoded packet over, say, AMQP.

INT-2711 Syslog Transformer

PR Comments; Polishing.

Remove List option; support to-map version only.
2012-08-14 14:15:21 -04:00
Gary Russell
ca7e78a2d2 Merge pull request #583 from olegz/INT-2712 2012-08-13 10:08:31 -04:00
Oleg Zhurakousky
ad3af54ed6 INT-2712 Fix ConversionService Initialization
Fix initialization of the ConversionService logic
in HttpRequestExecutingMessageHandler to NOT throw an exception if
ConversionService is not an instance of GenericConversionService.

Check for ConfigurableConversionService instead.

INT-2712 polishing

INT-2712 Polishing Tests
2012-08-13 09:35:11 -04:00
Oleg Zhurakousky
c2d6486f9b Merge pull request #573 from garyrussell/INT-2704
* INT-2704:
  INT-2704 Exception Processing in TCP Adapter
2012-08-12 11:23:40 -04:00
Gary Russell
89d2f3ad83 INT-2704 Exception Processing in TCP Adapter
When using an outbound adapter with a server connection factory
(an inbound adapter 'owns' the connections), the outbound adapter
simply logged exceptions.

There are use cases where flows need to know the exception occurs.

Change the adapter to throw a MessagingException.

Update the 2.1 to 2.2. Migration guide explaining that the
ExpressionEvaluatingRequestHandlerAdvice can be used to restore
2.1 behavior, and trap the exception.
2012-08-12 11:22:31 -04:00
Gary Russell
3feef9414a Merge pull request #570 from olegz/INT-2638 2012-08-10 16:41:58 -04:00
Oleg Zhurakousky
bfb5cbdb2a INT-2638 added support for Redis inbound channel adapters
Currenly there is support for:
- list-inbound-channel-adapter - http://redis.io/commands#list
- zset-inbound-channel-adapter - http://redis.io/commands#sorted_set

INT-2638 polishing

INT-2638 polished schema docs

INT-2638 polishing

INT-2638 polishing

INT-2638 refactored Redis collection inbound adapters to use RedisStore (view)

INT-2638 polishing, exposed redis-template via the namespace

INT-2638 polished based on PR comments

INT-2638 polishing

INT-2638 Polishing
2012-08-10 16:26:24 -04:00
Oleg Zhurakousky
25afb09f48 Merge pull request #580 from artembilan/INT-2706
* INT-2706:
  INT-2706: fix 'expected-response-type' primitives
2012-08-10 08:04:40 -04:00
Artem Bilan
16d5377e8b INT-2706: fix 'expected-response-type' primitives
* HttpRequestExecutingMessageHandler: change Class.forName() to ClassUtils.forName()
* HttpRequestExecutingMessageHandler: some polishing about DRY
* OutboundResponseTypeTests: tests about "byte[]" & "[B" values for 'expectedResponseTypeExpression'
* OutboundResponseTypeTests: polishing to make it more quickly
* OutboundResponseTypeTests contexts: versionless XSD

JIRA: https://jira.springsource.org/browse/INT-2706
2012-08-10 08:03:37 -04:00
Oleg Zhurakousky
1cf52b92a8 Merge pull request #578 from ghillert/INT-2292
* INT-2292:
  INT-2292 - Document usage of default namespaces for XPath Expressions For reference see: https://jira.springsource.org/browse/INT-2292
2012-08-10 07:53:00 -04:00
Gunnar Hillert
f37aa9db81 INT-2292 - Document usage of default namespaces for XPath Expressions
For reference see: https://jira.springsource.org/browse/INT-2292
2012-08-10 07:51:24 -04:00
Oleg Zhurakousky
b5350fdb3c Merge pull request #575 from ghillert/INT-2392
* INT-2392:
  INT-2392 - ChainElementsFailureTests reads wrong 'xmlheader' property For reference: https://jira.springsource.org/browse/INT-2392
2012-08-10 07:48:57 -04:00
Gunnar Hillert
ef1c0fc93d INT-2392 - ChainElementsFailureTests reads wrong 'xmlheader' property
For reference: https://jira.springsource.org/browse/INT-2392

Code Review - Refactored Test Case
2012-08-10 07:46:40 -04:00