Commit Graph

212 Commits

Author SHA1 Message Date
Artem Bilan
877c62c5e7 INT-2884: Refactor Stream Tests to Use Mocks
Avoid hijacking stdout, stderr because the tests failed
when logging was enabled.
2013-02-01 15:50:52 -05:00
Gary Russell
b1921607d9 INT-2895 Update Bundlor Ranges for 2.2.1 2013-01-25 12:31:09 -05:00
Artem Bilan
2bc3ecb9d7 INT-2845: Gradle: Check XSD Versions in Tests
In many cases IDEs import into test configs Namespace-resources
with hardcoded versions of Spring & Spring Integration XSDs.

This may produce build issues with different Spring versions.

It also causes an issue during the transition to a new Spring Integration version (e.g. 3.0).

* Add Gradle task 'checkTestConfigs' to check test configs for hardcoded resources' versions.
* Add to 'test' task dependency on new task 'checkTestConfigs'
* Fix hadrcoded versions in the test configs.

JIRA: https://jira.springsource.org/browse/INT-2845
2013-01-14 10:45:03 -05:00
Gunnar Hillert
a5d7de848d INT-2674 - Add JdbcChannelMessageStore
INT-2674 - Added slow/failing JDBC Message Store Tests

INT-2674 - Code Review Changes

INT-2674 - Add support for HSQL

INT-2674 - Add documentation
* Refactor Test Cases
* Code Review Changes

INT-2674 - Code Review Changes

INT-2674 - Code Review Changes

INT-2674 - Renamed classes

INT-2674 - Code Review Changes
2012-11-21 09:22:20 -05:00
Gary Russell
c09ac0b5a8 INT-2814 Fix OSGI Versions for OXM/WS
OSGI version ranges were incorrect for oxm because it moved
to core. This precluded use with Spring 3.1 with OSGI.

Update oxm version range to match other Spring core modules.

Also update maximum for Spring-WS to < 3.0.0 and minumum to 2.0.0.

Also fix bundlor version ranges for new JPA module.
2012-11-09 11:09:31 -05:00
Gary Russell
959bb314e1 INT-2792 Update spring-amqp Version to 1.1.3
1.1.3.RELEASE includes enhanced JsonMessageConverter to
support applications using the ObjectToJsonTransformer.

avoid warning in AmqpOutboundGatewayParserTests
2012-11-07 09:15:33 -05:00
Gary Russell
413d5354a1 INT-2803 Fix Lazy Fetch of Email Messages
INT-2805 Update JavaMail to 1.4.5

There is a need to fetch the entire email message before the folder
is closed. Once the folder is closed, you cannot perform any
more operations on the message.

Prior to RC1, the message was copied, which forced an eager fetch.

Add code to copy the message.

Also, transaction synchronization operations need access to a folder
instance to perform operations, such as delete, on a message.

Add a wrapper to lazily create a folder instance in message.getFolder()
when needed.

Add documentation to explain that messages must be re-fetched before
performing transaction synchronization operations.

JavaMail 1.4.5 is now Open Source, which makes debugging much
easier.
2012-11-05 12:47:35 -05:00
Gunnar Hillert
4aaa59e758 INT-2804 - Update Spring dependency to 3.1.3
INT-2806 - Update Spring Security dependency to 3.1.3

For reference see:

* https://jira.springsource.org/browse/INT-2804
* https://jira.springsource.org/browse/INT-2806
2012-11-01 17:14:12 -04:00
Gunnar Hillert
2d81f3cc27 INT-2802 - Upgrade build.gradle to use Gradle 1.2
For reference see: https://jira.springsource.org/browse/INT-2802
2012-10-31 17:19:54 -04:00
Gunnar Hillert
fef6b356f8 INT-2794 - Spring Integration WS should depend on spring-webmvc
INT-2795 - Update Spring WS dependency to 2.1.1.RELEASE
INT-2796 - Update Spring-XML dependency to 2.1.1.RELEASE

Reference: https://jira.springsource.org/browse/INT-2794
2012-10-30 09:44:08 -04:00
Oleg Zhurakousky
e74e470d3d INT-2779-bundlor fixed manifest template 2012-10-19 12:07:33 -04:00
Oleg Zhurakousky
65ca797721 INT-2779 spring-data-mongo upgrade
upgraded to spring-data-mongo-1.1.1.RELEASE
removed safety logic that was put temporarily to address DATAMONGO-550/551
2012-10-19 11:20:00 -04:00
Gary Russell
870f6b0fe3 INT-2782 Fix spring-retry Import-Package
Bundlor: move retry packages above catch-all org.springframework.*
in the import template.
2012-10-12 09:27:29 -04:00
Mark Fisher
33b1018a51 reverting mongodb upgrade to fix issues 2012-10-10 18:02:23 -04:00
Mark Fisher
27a292c478 INT-2779 upgrade spring-data-mongodb to 1.1.0.RELEASE 2012-10-10 17:43:18 -04:00
Mark Fisher
837562676f INT-2784 upgrade spring-data-redis to 1.0.2 2012-10-10 15:47:32 -04:00
Gary Russell
53e5afe0b8 INT-2747 Change Bundlor Spring Minimums
While Spring Framework 3.1 is recommended for Spring
Integration  2.2, it continues to support Spring 3.0.

Change build.gradle to use 3.0.7 as the minimum instead
of 3.1.1.
2012-09-21 10:49:27 -04:00
Gary Russell
49a6079d1a INT-2683 Add Reply Listener Container Option
INT-2683 Tests

Expanded JMS Gateway Tests

INT-2683 First commit

Listener Container Option for Replies

INT-2683 Remove no correlation-key Option

INT-2863 Support DestName and Temp Dest

INT-2683 Add back Support No CorrelationKey

INT-2683 Fix Tests

INT-2683 Polishing

Fallback if no correlationKey and fixed reply queue.

INT-2683 Polishing

Change from SMLC to DMLC

INT-2683 Polishing

Since we changed to DMLC, we can now remove the check for
SingleConnectionFactory.

INT-2683 <reply-listener/> Namespace Support

Add <reply-listener/> subelement to JMS Outbound Gateway.
2012-09-20 21:22:11 -04:00
Oleg Zhurakousky
ee91a6ce5a INT-1819 Mail pseudo-tx support
Added pseudo-tx support for Mail inbound adapters
For polling adapters no changes have been made other then returning a javax.mail.Message instead of its copy so
post-tx dispositions could be performed on it.
For Imap IDLE adapter changes are simiar to the once present in SPCA where TX synchronization logic was added to ImapIdleChannelAdapter
Couple of things to note:
First IDLE receives an array of messages while Polling task receives one message which means i need to sendMessage in the Polling task in the separate thread, so for maintaining single thread semantics we have now it uses single thread executor to send Messages
Renamed MSRH to TransactionalResourceHolder since we no longer use 'source' anywhere and in the case of IDLE there is no MessageSource. Its is truly a holder of attributes we want to make available for use (e.g., SpEL)

INT-1819 Polishing

- Change TransactionalResourceHolder to IntegrationResourceHolder
- Make messageSource available as an attribute
- Allow configuration of Executor for ImapIdle adapter
- Add parser test for TX ImapIdle adapter
- Fix bundlor config for mail
- Remove top level <transactional/> element that was added to core
- Restore 'legacy' mail attributes in TX, and add schema doc

INT-1819 Mail TX Reference Docs

Add reference documentation for mail transaction support.

INT-1819 Remove 'public abstract' from interface

Modifiers are not needed on an interface.
2012-09-19 12:12:31 -04:00
Gunnar Hillert
4be6a33450 INT-2752 - Fix build.gradle for Spring 3.2 compatibility
For reference: https://jira.springsource.org/browse/INT-2752
2012-09-18 00:04:55 +01:00
Oleg Zhurakousky
94cc5a73e2 INT-2727 PseudoTX Refactoring
Remove the need for pseudo-transactional element

INT-2727 PseudoTX
Add PseudoTransactionalTransactionManager

INT-2727
addressed PR comments
cherry picked previous code for mail module to eliminate breaking change

INT-2727
initial refactoring pseudo-tx support to use common configuration

INT-2727
finalizing pseudo-tx synchronization support

INT-2727 polishing

INT-2727 polishing based on PR comments

INT-2727 addressed PR comments

INT-2727 polishing

INT-2727 Remove PseudoTransactionalMessageSource

Instead of getResource, bind the resource holder before
receive() and then add attributes to the holder.

INT-2727 polishing

INT-2727 Polishing

Remove bind of #resource; add beforeCommit() test;
add TransactionTemplate tests.
2012-09-05 16:55:34 -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
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
08cbab08c2 INT-2214, INT-343, INT-2250 MessageHandler Advice
Add general capability to advise just the handleRequestMessage
part of an AbstractReplyProducingMessageHandler.

This is to advise just the immediate operation, and not the
entire downstream flow.

Uses include:

* outbound gateway post processing
* adding retry behavior using spring-retry
* adding circuit breaker functionality

Initial commit for review.

Also need to advise simple message handlers (such as file
etc) to allow them to post-process file operations
with payload.delete(), payload.renameTo(...) etc.

INT-2250 Add Circuit Breaker Advice

INT-343 Add Retry Advice

Stateless and Stateful retry using spring-retry. Stateless
means the RetryTemplate performs the retries internally.
Stateful means the exception is thrown (e.g. to JMS container)
and the retry state is maintained by spring-retry.

INT-2215, INT-343, INT-2250 Refactoring

Factor out common abstract Advice class.

INT-2214 Catch Evaluation Expression Exceptions

If an onSuccess expression evaluation fails, add an
option so the user can decide whether such an exception is
caught, or propagated to the caller.

INT-2214 etc PR Review Polishing

INT-2214 etc Namespace Core, File, FTP

Add <request-handler-advice-chain/> to outbound endpoints.

INT-2214 etc. More Namespace Support

amqp, event, gemfire, groovy, http, ip, jdbc, jms, jmx, jpa, mail, rmi, sftp, twitter, ws, xmpp

INT-2214 etc Polishing

PR Review

INT-2214 etc Polishing

Don't catch Throwable.

Move Advice classes to handler.advice package.
2012-08-06 09:15:58 -04:00
Gunnar Hillert
78c85c2510 INT-2680 - Duplicate Content-Type header
For reference please see: https://jira.springsource.org/browse/INT-2680
2012-08-03 00:09:56 -04:00
Gunnar Hillert
57bc67b8fb INT-2689 - SI builds without warnings (Except Spring Integration HTTP)
* Ensure that no deprecation warnings occur
* Spring Integration builds with all tests successfully for Spring 3.1.2.RELEASE and 3.0.7.RELEASE (Except Spring Integration HTTP)

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

INT-2694 - Fix Http Test Failures with Spring 3.0

As part of INT-2689, fix Http Test Failures in the Spring Integration Http Module when using Spring 3.0.7.RELEASE
For reference see: https://jira.springsource.org/browse/INT-2694
2012-08-01 13:09:51 -04:00
Gunnar Hillert
cef6113854 INT-2681 - Upgrade to Gradle 1.0 GA
For reference: https://jira.springsource.org/browse/INT-2681
2012-07-25 15:49:07 -04:00
Oleg Zhurakousky
c6076f350f INT-2677 Upgrade JMS Module to use ActiveMQ 5.6.0 2012-07-18 13:25:46 -04:00
Oleg Zhurakousky
be60db8065 INT-2659 upgraded to Spring Data Redis 1.0.1 2012-07-12 10:59:33 -04:00
Gary Russell
047978860e INT-2658 Upgrade Spring to 3.1.2 2012-07-10 19:14:32 -04:00
Gary Russell
7fc71fb5b5 INT-2647 spring-tx Needed as Transitive Dependency
Pseudo transaction support means some projects now
need a transitive dependency to spring-tx. Previously
the project was marked as optional in the POM.
2012-07-02 16:16:11 -04:00
Gary Russell
066eb91100 INT-1849/INT-2147 Add Disposition to File Adapter
* Add *disposition-expression* to the inbound file adapter. This allows for operations such as *payload.delete()*, *payload.renameTo()* after the file is processed.
* The result of executing the expression (if any) is sent to the disposition-result-channel.
2012-06-25 11:38:20 -04:00
Gunnar Hillert
0269de0f98 INT-2564 Move Some SocketTestUtils to Test Module
Move SocketTestUtils.findAvailableServerSocket to Test Module

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

* Move SocketTestUtils.findAvailableServerSocket to Spring Integration Test Module
* Fix tests
2012-06-21 12:35:22 -04:00
Gunnar Hillert
121018190f INT-805 - Dynamically create directories
Dynamically create directories with file:outbound-channel-adapter

* add **directory-expression** attribute for File Outbound Channel Adapter and File Outbound Gateway
* add JUnit tests

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

INT-805 Code Review

* Fixed Spelling
* Fixed Code Convention issues
* Add support for expressions that resolve to File
* Add more JUnit tests

INT-805 - Code Review Changes

* Combine destinationDirectoryExpression and destinationDirectory
* Fix Tests

INT-805 - Code Review

* Always apply *destination directory* validation for each message (including LiteralExpressions)

INT-805 - Code Review changes

INT-805 - Added 2 exclusions to .gitignore
2012-06-15 11:28:53 -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
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
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
Gary Russell
d06154bdbc INT-2591 Upgrade spring-amqp to 1.1.1.RELEASE 2012-05-31 15:03:51 -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
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
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
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
840a907668 INT-2437 upgraded mongo to 1.1.0.M1 2012-05-08 12:51:36 -04:00
Gary Russell
87666d7d8e INT-2535 Update Version to 2.2.0.BUILD-SNAPSHOT
Also update bundlor version ranges for
SI and SF.
2012-05-04 08:57:48 -04:00
Gunnar Hillert
027b03af87 INT-2517 - Upgrade to Spring 3.1
* Update **build.gradle** and change the *springVersion* property to **3.1.1.RELEASE**
* Due to change in Spring 3.1, add missing method **getRawStatusCode()** in *org.springframework.integration.http.outbound.CookieTests*
2012-04-21 02:29:42 -04:00
Gunnar Hillert
0eae03025e INT-2512 - Upgrade to Gradle 1.0-rc-1
* Upgrade Gradle Wrapper
* Remove deprecation warnings
* Fix Sonar Build

Depends on: https://github.com/SpringSource/gradle-plugins/pull/1

INT-2512 - Improve declaration of optional and provided dependencies

INT-2512 - Reverted Bundlor Plugin Version Number.
With that change the Spring Integration specific part of the code changes is decoupled from the Bundlor pull request:

https://github.com/SpringSource/gradle-plugins/pull/1
.
Once the Bundlor plugin is updated and released, I can bump the version number (Only then, though all deprecation warnings will be gone).

INT-2512 - Code Review

**Do we really want to add mavenlocal() permanently? I usually add it locally when I need it**

Sorry my bad. Forgot to remove my local addition.

**snapshot?**

The Bundlor plugin relies on Snapshot releases for the Gradle plugin (I reverted the DocBook version).

**mixed leading tabs and spaces**

Removed every single leading space. Unfortunately, there were lots of spaces. Took a while. I hope this looks much better.

**Why are we removing this? Don't we need a local install any more?**

The Maven install logic is now handled by the customized/extended "maven" plugin in **publish-maven.gradle**. This is how Chris has set it up for the Spring Framework.

INT-2512 - Remove mavenLocal()

Change 'build/jacoco.exec' to '${buildDir.name}/jacoco.exec'.
2012-04-19 12:36:10 -04:00
Oleg Zhurakousky
a37c7a0821 INT-2479 UUID Header Conversion
Refactored MongoDbMessageStore to ensure that the Message metadata is persisted consistently using already provided converters. Major refactoring went into MessageWrapper and MongoDbMessageStore.write method which was greatly simplified based on the fact that MessageWrapper now represents the structure that needs to be persisted

INT-2479
fixed default converters to make sure that UUID is stored in Mongo with type information, so the actuall UUID type could be restored
2012-03-29 15:48:16 -04:00
Gunnar Hillert
3e030cd4bc INT-2468 - Fix DocBook <ulink/> PDF Problems
* upgrade the Docbook Reference plugin dependency from version **0.1.2-SNAPSHOT** to **0.1.3**
* change any occurrences (only the external links):

from

    <link href="http://www.eaipatterns.com/StoreInLibrary.html">Claim Check</link>

to

    <ulink url="http://www.eaipatterns.com/StoreInLibrary.html">Claim Check</ulink>
2012-03-23 10:55:11 -04:00
Oleg Zhurakousky
86527f8dd9 INT-2420 fixed com.mongodb Import-Package to reflect unbounded lower range 2012-03-20 12:14:10 -04:00
Gary Russell
48ae843304 Revert "INT-2437 upgraded spring-data-mongo to 1.0.1"
This reverts commit 2ddf1d7a33.
2012-03-08 12:31:58 -05:00