Commit Graph

7448 Commits

Author SHA1 Message Date
Gunnar Hillert
24abdf65b1 INT-2444 - Polling Consumer Reference Doc Fix
* In Chapter 7.1.3 Polling Consumer - The Java TX Configuration Example for Consumer is incorrect
* Add documentation for the adviceChain property
* Add references to the Advice Chain and Transaction Support Sections
* Fix Layout issues of the code listings

For reference: https://jira.springsource.org/browse/INT-2444
2012-06-21 13:41:29 -04:00
Gary Russell
92c62932dc Merge pull request #495 from olegz/INT-1141 2012-06-21 13:32:06 -04:00
Oleg Zhurakousky
2b49c66f64 INT-1141 Improve on how MessageHandlers are stored
INT-1141 polished code

INT-1141 added tests

INT-1141 improved how iterator is obtaind from OrderAwareLikedHashSet

INT-1141 polishing

INT-1141 stashed commit with List-based collection and performance tests

INT-1141 improved OrderedAwareLinkedHashSet

INT-1141 polishing

INT-1141, INT-2627 improved LoadBalancingStrategy and
RoundRobinLoadBalancingStrategy to obtain handler's iterator faster

INT-1141 improved getHandlerIterator method to ensure that it only executes reordering logic if there are more then one handler

INT-1141 simplified OrderedAwareLinkedHashSet to not to extend from LinkedHashSet

INT-1141
changed OrderedAwareLinkedHashSet to OrderedAwareCopyOnWriteArraySetTests, imporoved array creation in RoundRobinLoadBalancingStrategy

INT-1141 polished failing tests and RoundRobinLoadBalancingStrategy. Removed 'transient' from OrderedAwareCopyOnWriteArraySet
2012-06-21 13:03:50 -04:00
Gary Russell
7dd1255351 Merge pull request #510 from ghillert/INT-2564 2012-06-21 12:36:50 -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
Gary Russell
f505d426a2 Merge pull request #507 from artembilan/INT-2622 2012-06-21 11:52:28 -04:00
Artem Bilan
e5061c070b INT-2622: add JMX support for DelayerHandler
* introduce DelayHandlerManagement
* add GroovyControlBusIntegrationTests
* test for Delayer Management via Groovy Control Bus
2012-06-21 11:33:17 -04:00
Gary Russell
0a6e44ddc5 Merge pull request #505 from artembilan/INT-2605 2012-06-21 10:09:48 -04:00
Artem Bilan
de73c39488 INT-2605: add SmartLifecycle support for 'chain'
* polishing TCP test to use SmartLifecycle from 'chain'
* polishing XSD to exclude using 'poller' element inside 'nested-chain'

INT-2605: eliminate breaking change in the XSD
2012-06-21 10:06:47 -04:00
Gary Russell
6fea731809 Merge pull request #503 from ghillert/INT-2616 2012-06-20 12:39:38 -04:00
Gunnar Hillert
708306a891 INT-2616 - Fix Spelling Error in Schema
* Fix spelling error - `hostory`
* Remove trailing white-space

INT-2616 - Fixed several spelling issues
2012-06-20 11:13:39 -04:00
Gunnar Hillert
eead196808 Merge pull request #502 from garyrussell/INT-2523
* garyrussell-INT-2523:
  INT-2523 Add QOS Attributes on JMS Channel
2012-06-19 11:45:11 -04:00
Gary Russell
f9741d7ef3 INT-2523 Add QOS Attributes on JMS Channel
The Factory Bean already supported the attributes but
the namespace did not.

Also, the priority was fixed (if set via the factory bean).

Add QOS attributes to schema/parser; add use of
DynamicJmsTemplateProperties to allow override of configured
priority with the priority header (in the same way as the
outbound endpoints).
2012-06-19 11:14:59 -04:00
Gary Russell
39491a1df7 Merge pull request #488 from artembilan/INT-1132a 2012-06-19 10:02:31 -04:00
Artem Bilan
d1d4faa151 INT-1132: Rescheduling Support for DelayHandler
- Add support for DelayHandler to reschedule persisted Messages on startup via 'implements ApplicationListener<ContextRefreshedEvent>' as late as possible
- Change DelayHandler dependency to MessageGroupStore
- Add required DelayHandler.messageGroupId property
- Make registered by SI-namespace TaskScheduler as default for DelayHandler
- Remove 'required' from delayer xml-attribute 'default-delay' as redundant
- Additional refactoring & polishing around <delayer>
- Polishing delayer's Tests
- Tests for 'rescheduling'
- Integration test for 'rescheduling' with JdbcMS

INT-1132: add 'initializingLatch' to DelayHandler

INT-1132: additional polishing

INT-1132: add LIFO JMS polling test-case

INT-1132: Changes according to PR comments

INT-1132: Changes according to PR comments 2

Polishing

Remove blocking calls from tests.
2012-06-19 10:00:03 -04:00
Gary Russell
84f66e059b Merge pull request #504 from ghillert/INT-2514 2012-06-18 17:50:12 -04:00
Gunnar Hillert
7651d9fdf7 INT-2514 - Remove redundant cast in AutoCreateCandidatesCollector
Jira: https://jira.springsource.org/browse/INT-2514
2012-06-18 17:47:55 -04:00
Gary Russell
41d73d91b3 Merge pull request #500 from mstine/INT-2575 2012-06-18 17:32:31 -04:00
Matt Stine
77b8beabaa INT-2575 Eliminate unnecessary String replace on JDBC calls
Introduced a simple map-based query cache. Lazily initialized cache on
calls to getQuery().

This still requires a String replace on the first JDBC call for a
particular query, but seemed like a cleaner solution than implementing
a post-construction method that individually process each constant.

INT-2575 Eliminate unnecessary String replace on JDBC calls

Introduced Query enum to enable use of query name as cache key
rather than query value.
2012-06-18 17:31:18 -04:00
Gary Russell
72562c7aa4 Merge pull request #501 from artembilan/INT-2621 2012-06-18 16:54:29 -04:00
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