Commit Graph

6528 Commits

Author SHA1 Message Date
Artem Bilan
81579f7491 INT-2621: make tests verifying file paths OS independent
INT-2621 Polishing

Move file separator replacement code to TestUtils in
s-i-test.
2012-06-18 16:53:56 -04:00
Oleg Zhurakousky
a6049bc51c Merge pull request #496 from ghillert/INT-2618
* INT-2618:
  INT-2618 - Document directory-expression attribute
2012-06-15 11:45:52 -04:00
Gunnar Hillert
97b59c2acd INT-2618 - Document directory-expression attribute
* Add documentation directory-expression
* Add documentation for auto-create-directory attribute
* Refactor File Adapter chapter slightly so that it flows better

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

INT-2618 - Doc updated due to changes in INT-805

* rebased
* clarified the file section in the reference doc
2012-06-15 11:45:00 -04:00
Oleg Zhurakousky
9082512a48 Merge pull request #494 from ghiller/INT-805
* INT-805:
  INT-805 - Dynamically create directories
2012-06-15 11:29:40 -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
d74dbd3b1f Merge pull request #498 from mstine/INT-2583
* INT-2583:
  INT-2583 Update Reference Copyright
2012-06-14 21:41:58 -04:00
Matt Stine
31a935540b INT-2583 Update Reference Copyright
Updated the copyright message to the text contained within the JIRA
issue.

Idiomatic docbook seems to reference each individual year w/ an
opening/closing <year/> tag, rather than listing the years as a range
as indicated in the JIRA issue. I took this approach.
2012-06-14 20:20:20 -05:00
Gary Russell
3fda7f066b Merge pull request #492 from olegz/INT-2470 2012-06-14 18:52:56 -04:00
Oleg Zhurakousky
750501d66c INT-2470 Add 'append to file' Capability
Add capability to append to a file, if it already exists, to File Outbound Channel Adapter.
The new attribute is 'append' and is mutually exclusive with 'temporary-file-suffix' since
when appending to a file we can no longer write to a temporary file and then rename it.

INT-2470 addressed PR comments

INT-2470 PR Comments

INT-2470 polishing

changed logic behind File copy when one file needs to be appended into another

INT-2470 added WhileLockedProcessor

INT-2470 polishing
2012-06-14 18:36:02 -04:00
Oleg Zhurakousky
3da251ed5c Merge pull request #493 from garyrussell/INT-1849
* INT-1849:
  INT-1849/INT-2606 Pseudo Transactional Message Src
2012-06-14 17:02:22 -04:00
Gary Russell
9bc9867d31 INT-1849/INT-2606 Pseudo Transactional Message Src
Initial commit.

Tested with POP3 and IMAP (James) with Sample app.

Essentially moved all the flagging and deleting code
from receive() to closeContextAfterSuccess().

For non-transactional cases, this new method is
called immediately after receiving the message(s),
essentially working as before.

When run from a <transactional/> poller it is
called using TransactionSynchronization after
the transaction commits.

This behavior can be changed by setting
'symchronized="false"' on the poller, which
removes the synchronization and the update
is called immediately after the receive().

Polishing

PR Comments

Update Reference
2012-06-14 16:55:53 -04:00
Gary Russell
4e9a393983 Merge pull request #491 from olegz/INT-2594 2012-06-13 16:06:31 -04:00
Oleg Zhurakousky
2b3e2614a1 INT-2594 Add BF support to Correlation Strategy
Add BeanFactory support to
ExpressionEvaluatingCorrelationStrategy

INT-2594 addressed PR comments
2012-06-13 15:51:49 -04:00
Gary Russell
517f632ce1 Revert "INT-2594 added BF support to ExpressionEvaluatingCorrelationStrategy"
This reverts commit 8758aec3d1.

Missed a second commit
2012-06-13 15:40:11 -04:00
Gary Russell
e3ca5ac5de Merge pull request #491 from olegz/INT-2594 2012-06-13 15:34:50 -04:00
Oleg Zhurakousky
8758aec3d1 INT-2594 added BF support to ExpressionEvaluatingCorrelationStrategy 2012-06-13 15:18:35 -04:00
Oleg Zhurakousky
8a4698d7cf Merge pull request #489 from ghillert/INT-2546
* INT-2546:
  INT-2546 Move method PollerParser.configureTransactionAttributes to IntegrationNamespaceUtils
2012-06-12 12:33:37 -04:00
Gunnar Hillert
9c5309c7e9 INT-2546 Move method PollerParser.configureTransactionAttributes to IntegrationNamespaceUtils
* Move method *PollerParser.configureTransactionAttributes* to *IntegrationNamespaceUtils*
* Remove method *configureTransactionAttributes* from class *JpaParserUtils*

For reference see: https://jira.springsource.org/browse/INT-2546
2012-06-12 00:41:45 -04:00
Gary Russell
5232b8377c Merge pull request #480 from olegz/INT-1760 2012-06-07 16:27:29 -04:00
Oleg Zhurakousky
6bbe8057ab INT-1760, INT-1759 Http outbound gateway response type
Change the default expected response type to ResponseEntity

Add support for expected-response-type-expression attribute
to accept SpEL to determine expected response type.

INT-1760, INT-1759 add documentation.

INT-1760, INT-1759 polished javadocs and schema doc

INT-1760, INT-1759 more polishing

INT-1760, INT-1759 polished documentation based on PR

INT-1760 Polishing

Fix Chain test.
2012-06-07 16:25:36 -04:00
Gary Russell
e6520821d1 Merge pull request #481 from olegz/INT-1929 2012-06-07 14:47:49 -04:00
Oleg Zhurakousky
7207bb1840 INT-1929 Custom Mail SearchTerms
Add support for overriding default SeatchTerms in ImapMailReceiver

INT-1929 PR comments

Polish Docs
2012-06-07 14:45:16 -04:00
Oleg Zhurakousky
14f78509ea Merge pull request #487 from garyrussell/INT-2590
* INT-2590:
  INT-2590 Add TestingUtility
2012-06-07 14:12:24 -04:00
Gary Russell
011953a5b6 INT-2590 Add TestingUtility
Added testing utility from samples to provide a tool for
users to wait for servers to start during tests.

Also refactored all tests that had similar code to use
this class.

Also corrected two failing tests that needed this wait.
2012-06-07 13:59:07 -04:00
Oleg Zhurakousky
42ba0b7b56 Merge pull request #483 from artembilan/INT-1029
* INT-1029:
  INT-1029: Support for outbound-gateways in chain
2012-06-07 13:22:01 -04:00
Artem Bilan
5bc41bc60b INT-1029: Support for outbound-gateways in chain
XSD refactoring: remove use="required" from 'request-channel' attribute of all 'outbound-gateways'
Tests for all 'outbound-gateways' inside the <chain>
2012-06-07 13:20:56 -04:00
Oleg Zhurakousky
c3860e14b7 Merge pull request #485 from garyrussell/INT-2604
* INT-2604:
  INT-2604 Remove Deprecated Header
2012-06-07 13:01:15 -04:00
Gary Russell
48e972bf46 INT-2604 Remove Deprecated Header
The IPHeaders.CONNECTION_SEQ was replaced by the
standard sequenceNumber header (when applySequence is true)
in 2.1, in order to facilitate resequencing using the
standard resequencer.

This header was deprecated at that time. It is now
removed.

Users that were relying on this header should set
applySequence to true on the connection factory.
2012-06-07 13:00:18 -04:00
Oleg Zhurakousky
a494dd2262 Merge pull request #484 from garyrussell/INT-2540
* INT-2540:
  INT-2540 AbstractJmsChannel wasn't Marked Abstract
2012-06-07 12:53:11 -04:00
Gary Russell
e6bac96217 INT-2540 AbstractJmsChannel wasn't Marked Abstract
Class should have been abstract. In any case,
it could not be used in any meaningful way
as a concrete class so changing it would
not represent a breaking change.
2012-06-07 12:51:53 -04:00
Oleg Zhurakousky
dae6470248 Merge pull request #482 from garyrussell/INT-2459
* INT-2459:
  INT-2459 Add Support for TCP Failover
2012-06-07 12:26:47 -04:00
Gary Russell
7ede0eb4e6 INT-2459 Add Support for TCP Failover
Implemented a ConnectionFactory that wraps a list
of connection factories, used to fail over if
a connection fails.

INT-2459 Polishing

Rebase; fix test; move boolean resets to finally block
in server factories.

INT-2459 Polishing

PR Review

Fix a test that could block indefinitely when error
in code under test.
2012-06-07 12:25:42 -04:00
Gary Russell
b7a4529a6e Merge pull request #478 from olegz/INT-2516 2012-06-07 11:33:15 -04:00
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