Commit Graph

6573 Commits

Author SHA1 Message Date
Gunnar Hillert
2dfd0be078 Merge pull request #524 from garyrussell/INT-2636
* garyrussell-INT-2636:
  INT-2636 Gateway Timeout Changes
2012-06-27 11:52:07 -04:00
Gary Russell
d66ba9ca74 INT-2636 Gateway Timeout Changes
Previously, the timeouts in @Gateway method annotations always
overrode the default timeout if specified in, say, XML.

Now, the @Gateway timeouts are applied only if

* The equivalent default was not set
* The annotation value is something other than the default (Long.MIN_VALUE)

Note: This is a breaking change for one scenario:

<int:gateway ... default-reply-timeout=1000 ... />

where the interface has a method annotated with @Gateway(replyTimeout=Long.MIN_VALUE)

In other words, when the user wants a default timeout on the gateway
but wants to override it for just the annotated method and happened to use
the new default value.

The @Gateway annotation does not allow us to detect whether its
attribute value came from the default or was explicitly set.

The work-around for this breaking change is to use a different negative
number to configure an infinite timeout:

@Gateway(replyTimeout=-1)
2012-06-27 09:15:31 -04:00
Gunnar Hillert
9b5d5fc6f7 Merge pull request #514 from garyrussell/INT-2515
* garyrussell-INT-2515:
  INT-2515 More Orderly Shutdown
2012-06-26 10:45:33 -04:00
Gary Russell
ae0abc4f6c INT-2515 More Orderly Shutdown
* Add beginShutdown() and endShutdown() to OrderlyShutdownCapable
* JMS/AMQP stop listener containers
* TCP (server side)
** after beginShutdown() disallow new connections, drop (log) new messages
** after endShutdown() close server socket
* HTTP (server side)
** after beginShutdown() disallow any new requests (503 Service Unavailable)

* Docbook updates
** What's new section
** Orderly Shutdown section.
2012-06-26 10:31:22 -04:00
Gary Russell
8c09655554 Merge pull request #521 from ghillert/INT-2454 2012-06-25 16:32:14 -04:00
Gunnar Hillert
da858b7451 INT-2454 - Doc: Add chapter 'AMQP Message Headers'
* Fix docs don't mention the need to add **amqp_** prefix to headers in order to have *DefaultAmqpHeaderMapper* add it to the message
* List all available standard AMQP Headers from class *AmqpHeaders*

For reference see: https://jira.springsource.org/browse/INT-2454
2012-06-25 16:31:46 -04:00
Gary Russell
0f9c8f5b58 Merge pull request #520 from ghillert/INT-2521 2012-06-25 16:31:29 -04:00
Gunnar Hillert
13890dab14 INT-2521 - SFTP Adapter Session Factory Doc Improvement
* fix Missing documentation of "enableDaemonThread" property of the SFTP session factory
* Reference documentation clean-up
* Document all properties of the DefaultSftpSessionFactory
2012-06-25 16:21:35 -04:00
Gunnar Hillert
9b541c8618 Merge pull request #508 from garyrussell/INT-2147
* garyrussell-INT-2147:
  INT-1849/INT-2147 Add Disposition to File Adapter
2012-06-25 12:06:55 -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
Gary Russell
703122a6fb Merge pull request #519 from ghillert/INT-2597 2012-06-22 11:12:22 -04:00
Gunnar Hillert
8a7fed15f6 INT-2597 - Fix the static port in Http Test
* Use *SocketUtils* to determine port dynamically rather than hard-coding it

Reference: https://jira.springsource.org/browse/INT-2597
2012-06-22 11:02:30 -04:00
Gary Russell
24d2acd368 Merge pull request #517 from ghillert/INT-2441 2012-06-22 10:02:52 -04:00
Gunnar Hillert
59d87ab7ae INT-2441 - Fix HTTP documentation
* Rework Http Inbound Gateway chapter, as it contains a link to a non-existing chapter
* Improve/rephrase/update chapter
* Add more relevant links to samples and external documentation
2012-06-22 09:59:21 -04:00
Gary Russell
341490d356 Merge pull request #516 from artembilan/INT-2623 2012-06-22 09:52:46 -04:00
Artem Bilan
3ea416bd84 INT-2623: document Delayer's changes
JIRA: https://jira.springsource.org/browse/INT-2623
2012-06-22 09:50:59 -04:00
Gary Russell
a9963e5d09 Merge pull request #515 from artembilan/INT-1132-Fix 2012-06-21 17:34:11 -04:00
Artem Bilan
0e31624083 INT-1132 Fix Failing Delyer Test
INT-1132: Eliminate delayer's tests sensitive

* There is no guarantee that a Message will be delayed after restart for exactly the remaining time; it may be delayed longer.
* Remove assert around 'receive time'
* Remove redundant LIFO test-case: now `DelayHandler` just uses simple iteration over `MessageGroup`

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

Build report: https://build.springsource.org/browse/INT-B22X-JOB1-91/test/case/110952529
2012-06-21 17:31:25 -04:00
Gary Russell
7f81d294da Merge pull request #506 from ghillert/INT-2596 2012-06-21 15:27:11 -04:00
Gunnar Hillert
6aa323e66b INT-2596 Fix JMX Documentation Chapter
* <int-jmx:mbean-exporter...> doesn't exist in XSD v2.1 --> Should be **mbean-export**
* Convert tabs to spaces
* Fix code listings that go beyond margins
* Fixed several spelling errors
* Improve consistency
* Improve column layout of tables

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

INT-2596 - PR Review

* Rephrased and clarified 3 paragraphs in the JMX chapter of the reference documentation
2012-06-21 15:24:36 -04:00
Gary Russell
97661cc39a Merge pull request #512 from artembilan/INT-2607 2012-06-21 14:47:06 -04:00
Artem Bilan
25a2efe59c INT-2607: refactor 'resolveId' with pC.isNested()
* add delegation to `BeanDefinitionReaderUtils.generateBeanName(definition, parserContext.getRegistry(), parserContext.isNested())`
in the `AbstractBeanDefinitionParser#resolveId()` implementations when it is necessary.
* remove redundant `shouldGenerateId()` & `shouldGenerateIdAsFallback()` when they don't make sense.
* additional simple polishing in the affected classes.
* remove TODO & forced 'id' attribute from JpaOutboundGatewayTests-context.xml to check that this solution works as was booked.

JIRA: https://jira.springsource.org/browse/INT-2607
2012-06-21 14:30:32 -04:00
Gary Russell
284464383d Merge pull request #513 from ghillert/INT-2290 2012-06-21 13:54:55 -04:00
Gunnar Hillert
a4a27e941f INT-2290 - Document Top Schema Elements in XML Module
* Make sure all top-level XML Elements have documentation
* Convert space to tabs
2012-06-21 13:45:49 -04:00
Gary Russell
af4dfbaa94 Merge pull request #511 from ghillert/INT-2444 2012-06-21 13:43:55 -04:00
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