Commit Graph

6614 Commits

Author SHA1 Message Date
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
Oleg Zhurakousky
22536d26bf INT-2544 Fix FIFO problem with JdbcMessageStore
Improved polling from Jdbc - INT-2200
To accomplish all that schema change was required so new schemas are commited as well

INT-2544b polished based on Artem's comments

INT-2544b more polishing based on Artem's comments

INT-2544b more polishing based on Artem's comments

INT-2544
defined doPollForMessage(..) method so it could be overriden with custom query to get a single message from the DB

INT-2544
polishing, removed unused import

INT-2544
polishing, added protected getter for JdbcOperations, polished Javadocs

INT-2544 polishing

INT-2544b polishing
added fallback on update when create MessageGroup query fails, fixed the update date

INT-2544b polishing PR comments

INT-2544b polishing white spaces

INT-2544b polsihing white spaces
2012-05-21 11:09:39 -04:00
Oleg Zhurakousky
a1c2c63534 Merge pull request #445 from artembilan/INT-2557
* INT-2557:
  INT-2557: chain with jpa:outbound-channel-adapter
2012-05-18 12:56:16 -04:00
Artem Bilan
7e69921e13 INT-2557: chain with jpa:outbound-channel-adapter
Integration test for <jpa:outbound-channel-adapter> inside <chain>.
Polishing JpaOutboundChannelAdapterTests for increase execution speed.
Removal version from XDS URLs from the affected contexts.
2012-05-18 12:55:20 -04:00
Oleg Zhurakousky
030a53e6d5 Merge pull request #447 from garyrussell/INT-2417
* INT-2417:
  INT-2417 Alias Endpoints with Generated Names
2012-05-18 12:51:57 -04:00
Gary Russell
59d7432eef INT-2417 Alias Endpoints with Generated Names
Handlers for consumer endpoints get a generated name
derived from the endpoint class name.

It is useful (for example for autowiring in tests)
to give the handlers a well-known name.

If the endpoint has an ID attribute, the handler
now gets a bean name of "<ID>.handler".
2012-05-17 16:10:02 -04:00
Oleg Zhurakousky
b2620122e7 GRDL.Propertis changed gradle.properties back to 2.2.0.BUILD-SNAPSHOT 2012-05-15 18:39:07 -04:00
Spring Buildmaster
a81bf9f1f8 Release version 2.2.0.M1 2012-05-15 14:55:59 -07:00
Gary Russell
081fab47fb Merge pull request #441 from olegz/INT-2453 2012-05-15 17:11:24 -04:00
Oleg Zhurakousky
9656ee70f4 INT-2453 content-type and ObjectToJsonTransformer
Added 'content-type' functionality to ObjectToJsonTransformer

Added 'content-type' attribute to object-to-json-transformer element

Added parser and usage tests to ensure propper overrides
(see Mark's last comment here https://github.com/SpringSource/spring-integration/pull/409)

Applied required changes to Amqp module to work with standard 'content-type' header

INT-2453 polish based on PR comments

INT-2453 polished test

INT-2453 polished parser
2012-05-15 16:56:11 -04:00
Oleg Zhurakousky
c0e03a1666 Merge pull request #437 from dturanski/INT-2550
* INT-2550:
  INT-2550,INT-2552:added support for properties regionName and region to GemfireMessageStore
2012-05-15 13:12:02 -04:00
David Turanski
6dd48eff60 INT-2550,INT-2552:added support for properties regionName and region to GemfireMessageStore
INT-2555:Upgraded to spring-data-gemfire 1.1.1.RELEASE

document update

INT-2550,INT-2552: updated GemfireMessageStore, test, and docs per Oleg's comments

removed setRegion
2012-05-15 13:09:28 -04:00
Oleg Zhurakousky
2061c37608 Merge pull request #440 from ghillert/INT-2560
* INT-2560:
  INT-2560 - Fix tests in JpaPollingChannelAdapterTests For reference see: https://jira.springsource.org/browse/INT-2560
2012-05-15 13:02:56 -04:00
Gunnar Hillert
df804588d8 INT-2560 - Fix tests in JpaPollingChannelAdapterTests
For reference see: https://jira.springsource.org/browse/INT-2560
2012-05-15 11:47:33 -04:00
Gary Russell
2486f0cad4 Merge pull request #438 from ghillert/INT-2556 2012-05-14 18:26:09 -04:00
Gunnar Hillert
1b03c40abc INT-2556 - Fix Test JpaPollingChannelAdapterTests
For reference see: https://jira.springsource.org/browse/INT-2556
2012-05-14 18:22:39 -04:00
Oleg Zhurakousky
f564204466 Merge pull request #436 from garyrussell/INT-2509
* INT-2509:
  INT-2394 Support HA (Mirrored) Queues
2012-05-14 18:10:40 -04:00
Gary Russell
11e5fe0c0c INT-2394 Support HA (Mirrored) Queues
Changes to Connection Factory interface (stub).

INT-2394 Polishing

INT-2394 Map Gateway Correlation Header

Map spring_reply_correlation if present.

INT-2394 Map ReplyTo Stack

Enable the use outbound-gateway in a destination application
to which we sent a message using another outbound gateway.

The RabbitTemplate now pushed exising correlation data onto
a stacked header attribute.

INT-2509 Publisher Confirms and Returns

Add Publisher Confirm support to the outbound channel
adapter.

Add returns support to outbound channel adapter and gateway.

INT-2509 Polishing

PR Review comments.

Docs.

Fix chain test after rebase.
2012-05-14 18:09:59 -04:00
Oleg Zhurakousky
8fbc9264f7 Merge pull request #411 from ghillert/INT-1983
* INT-1983:
  INT-1983 - Add JPA Adapter For reference see: https://jira.springsource.org/browse/INT-1983
2012-05-14 13:30:54 -04:00
Amol Nayak
16f48a12e6 INT-1983 - Add JPA Adapter
For reference see: https://jira.springsource.org/browse/INT-1983

* INT-2435 - Add the ability to automatically resolve the entity-class from the payload as fallback
* Add <transactional/> support for **Jpa Outbound Gateway** and **Jpa Outbound Channel Adapter**
* Merging Documentation from: https://github.com/amolnayak311/spring-integration/blob/INT-2440/src/reference/docbook/jpa.xml
* Provide JPA Tests against Hibernate, EclipseLink and OpenJPA
* Improve Documentation
* Remove trailing white-space, convert white-space to tabs, remove @transactional from DefaultJpaOperations
* INT-2440 Adding the documentation for the JPA adapters

INT-1983 - Code Review based Fixes
* Fix indentation in XML Schema
* Remove *transactional* sub-element definition from JPA Inbound Channel Adapter in XML Schema
* Fix enumeration *gatewayType*

INT-1983 - Based on Code Review

* Remove '/** {@inheritDoc} */' from DefaultJpaOperations
* Remove JavaDoc parameters that don't contains details
* Cleanup *JpaUtils*
* Remove "transaction-manager-ref" from *spring-integration-jpa-2.2.xsd*
* Cleanup *spring-integration-jpa-2.2.xsd*
* Provide documentation to *EclipseLinkJpaOperationsTests* on how to run tests in IDE
* Provide documentation to *OpenJpaJpaOperationsTests* on how to run tests in IDE
* Refactor JPA Reference Doc Chapter (work in progress)

INT-1983 - Code Review: provide better JavaDoc
2012-05-14 13:12:06 -04:00
Oleg Zhurakousky
6c2f3d8dd0 Merge pull request #435 from artembilan/INT-2275
* INT-2275:
  INT-2275: any outbound-channel-adapter in <chain>
2012-05-14 13:00:42 -04:00
Artem Bilan
45c429ee2b INT-2275: any outbound-channel-adapter in <chain>
Add re-init logic for nested chains
Add logic about nested element for AbstractChannelAdapterParser
Refactor of DefaultOutboundChannelAdapterParser
Test for non-last nested chain with some outbound-channel-adapter
Improve XSD for chain-type
Manual outbound-channel-adapter ability for chain
Integration tests for all outbound-channel-adapter within <chain>
Remove redundant 'return-value-required' attribute from <stored-proc-outbound-channel-adapter>
Add support 'expectReply' for FileWritingMessageHandler

INT-2275 polishing & refactor FileOutbound*Parser

HttpRequestExecutingMessageHandlerTests polishing

INT-2275: polishing JavaDoc
2012-05-14 12:41:39 -04:00
Oleg Zhurakousky
4d5b8d5be1 Merge pull request #434 from ghillert/INT-2545
* INT-2545:
  INT-2545 - Upgrade bundlor-plugin + docbook-reference-plugin * Upgrade bundlor-plugin version to 0.1.2 * Upgrade docbook-reference-plugin to 0.1.5
2012-05-10 08:30:46 -04:00
Gunnar Hillert
4f88297de1 INT-2545 - Upgrade bundlor-plugin + docbook-reference-plugin
* Upgrade bundlor-plugin version to 0.1.2
* Upgrade docbook-reference-plugin to 0.1.5
2012-05-10 08:29:38 -04:00
Oleg Zhurakousky
e3e6ad7d91 Merge pull request #403 from garyrussell/INT-2485a
* INT-2485a:
  INT-2485 Orderly Shutdown
2012-05-10 08:11:07 -04:00
Gary Russell
0a12a496cc INT-2485 Orderly Shutdown
Initial commit - @ManagedOperation on IMBE

- can be invoked via JMX, <control-bus/>, or getting a reference to
the IMBE from the application context.

INT-2485 Updates After Review Comments (JIRA)

* Shutdown Schedulers first, and wait for them
* Add a force parameter, which overrides thread pool shutdown options
* Shutdown Sources/Channels after all thread pools have stopped
* Mark other components as OrderlyShutdownCapable (e.g. JMS/AMQP Listener containers) and shut them down first
* Wait for remaining time to allow for quiescence

Also
* remove TimeUnit parameter (not JMX-friendly); time limit is now always milliseconds
* If thread pools don't stop in time limit, force them down.

INT-2485 Handle Self-Destruction

Add shutdown-executor to IMBE.

When the shutdown was called on a Spring-Managed thread, the shutdown
was not clean because we timed out waiting for the current thread to
terminate. After that, we force terminated other components.

Now, by providing a dedicated Executor for the shutdown process, it
is used for the shutdown instead of the current thread. This Executor
is *not* shutdown.

It is not necessary to provide an Executor if the stopActiveComponents()
method is called on some other thread that is not involved in the
shutdown.

Also adds executor name to logs, when available.

INT-2485 Polishing

Fix MBean object name collision when running all tests.

INT-2485 Enable TCP Shutdown

Make TCP connection factories 'OrderlyShutdownCapable' so
they are stopped before schedulers/executors in order for
them to release any executor threads they are holding.

INT-2485 Polishing

Didn't need DirectFieldAccessor - scheduler and executor have
an accessor for the native ExecutorService.

Copyrights

INT-2485 Polishing

schemaLocation version.

INT-2485 PR Review Polishing
2012-05-10 08:10:00 -04:00
Gary Russell
77e3886a12 Merge pull request #424 from olegz/INT-2508 2012-05-09 13:57:32 -04:00
Oleg Zhurakousky
7d0dcf0805 INT-2508 Priority Channel FIFO
Fix a concurrency issue with the PriorityChannel by
introducing a private MessageWrapper; an implementation
of Message, to maintain the contract with the Comparator.

The MessageWrapper contains the original Message plus
an incremented sequence number, used as a tie-breaker,
to maintain FIFO semantics within priority.

Previously, the sequence number was added to, and removed
from, the headers of the original Message using a
DirectFieldAccessor.

This could cause concurrent modification
exceptions when it was removed.

INT-2508 polishing based on PR comments

INT-2508 Polish Whitespace
2012-05-09 13:50:08 -04:00
Oleg Zhurakousky
9235efe16b Merge pull request #431 from artembilan/INT-2542
* INT-2542:
  INT-2542: order attr. for logging-channel-adapter
2012-05-09 13:27:12 -04:00
Artem Bilan
1a5275a1ad INT-2542: order attr. for logging-channel-adapter
Additional tests for LoggingChannelAdapterParser
2012-05-09 13:25:31 -04:00
Gary Russell
a6c6120868 Merge pull request #422 from olegz/INT-2497 2012-05-08 16:55:41 -04:00
Oleg Zhurakousky
e1274f3bb4 INT-2497
changed warning message to error in AbstractCorrelatingMessageHandlerParser when both beanRef and expression are present, re-enabled commented out test to verify the error
2012-05-08 16:54:41 -04:00