Commit Graph

195 Commits

Author SHA1 Message Date
Gary Russell
3ea05576b3 INT-2832/2833 Aggregator Fix and Documentation
Expire empty groups.

Due to indentation changes, the code changes look more extensive
than they are. In effect the if (group.size() > 0) test is moved
to a narrower scope and the remove(group) is now performed if the
group is empty.

Document expire-groups-upon-completion.

INT-2832 Doc Polishing

PR Review + punctuation.

INT-2833 Add Delay For Expiring Empty Groups

minimumTimeoutForEmptyGroups
2012-11-30 15:31:36 -05:00
Gary Russell
7ef66e2e3f INT-2837 Fix Accept Hdr for Serializable Response
When the expected-response-type was Serializable,
no Accept: header was added.

The SerializingHttpMessageConverter overrides
canRead() from the superclass.

The superclass method allows null in the mediaType
parameter to return true. RestTemplate.AcceptHeaderRequestCallback
calls canRead() with null in the mediaType, preventing
the Accept header from being completed.

Remove the overridden method.

INT-2837 Disable Java Serialization over Http

Previously, Java serialization was enabled by default by
adding the SerializingHttpMessageConverter to the converter
lists (inbound and outbound endpoints). However, there was
a problem in that the Accept header was not set properly on
outbound requests.

Correcting the header could cause other side effects, such as
existing JSON applications using Java serialization instead.

It was felt that it would be safest to disable Java serialization
by default, while retaining the ability to use Java serialization
by explicitly configuring the message converter.

Update tests to deal with the fact the converter is not
configured by default.

INT-2837 Fix Schema Version in Test

Inadvertently added a spring 3.1 schema version.
2012-11-30 13:40:58 -05:00
Gunnar Hillert
a54312dc6f INT-2841 - Fix broken links 2012-11-30 12:03:12 -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
f501a6730e INT-2799/2811 Redis Store Adapter Changes
INT-2799 Use StringRedisTemplate by default on both inbound
and outbound store adapters.

Use a RedisTemplate with String key serializers and JDK
value serializers on the outbound store adapter if
'extract-payload-elements' is false.

INT-2811 Remove the ability to configure serializers on the adapters.

Use an external RedisTemplate for customized serialization
strategies.

INT-2811 Polishing (Review)

Polishing and updated Reference Doc.

polishing

using setters instead of ctor args for key or keyExpression

INT-2811 Polishing

Improve message when handler not initialized.

Add test for storing a simple value in a map.
2012-11-09 16:19:25 -05:00
Gary Russell
16ff848321 INT-2797 Document JSON Transformer content-type
Add note about content-type for the <object-to-json-transformer/>
and the caveat for when using AMQP adapters.

INT-2797 Polishing

Add alternative solutions, including setting a defaultType on
an inbound JsonMessageConverter.
2012-11-06 14:09:25 -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
Gary Russell
c52babd068 INT-2788 AMQP return-channel Doc. Improvements
Clarify the configuration needed for returned messages.

INT-2788 Fix Link to spring-amqp Reference

Broken link.
2012-11-01 12:11:55 -04:00
Artem Bilan
6e6d5a9240 INT-2766: fix early closed tag <appendix> 2012-10-15 14:48:14 +03:00
Oleg Zhurakousky
8c43c59c03 INT-2777 TransactionSynchronization
Ensured that bindings of the resource only happen if TransactionSynchronizationFactory is not null
Add documentation describing the expectation for the unbinding of the resource.

INT-2777 Polishing

Don't set up holder if it's not used.

Doc fixes.
2012-10-11 17:46:45 -04:00
Oleg Zhurakousky
e01d7fc922 INT-2764 added what's new for Redis/Mongo adapters 2012-10-11 17:13:55 -04:00
Gunnar Hillert
990b643e5a INT-2766 - Fix Appendices
Docbook ToC: Sections 31, 32, 33 Appear under V. Appendices
For reference: https://jira.springsource.org/browse/INT-2766
2012-10-11 01:41:33 -04:00
Gary Russell
039c7dff15 INT-2765 Remove Obsolete Annotation from Docs
@ChannelAdapter was removed in '08.

c16c3abb30
2012-10-03 11:27:50 -04:00
Gary Russell
2340e6f442 INT-2763 Send AdviceMessage from Advice
The ExpressionEvaluatingMessageHandlerAdvice now sends an
AdviceMessage which has a payload of the original message, and
a property 'inputMessage' referencing the message that was
sent to the advised handler.

INT-2763 Expression Advice Reference Doc Update

Update to reflect the new behavior.
2012-09-21 14:08:40 -04:00
Gunnar Hillert
7055845424 INT-2218 - Chain Parser Validation Improvements
Components within Chain: Add parser validation

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

INT-2218 - Code review changes

INT-2218 - Fix HttpOutboundGatewayParserTests

INT-2218 - Remove input-channel validation

Was already covered by PR #592
2012-09-21 12:22:52 +01:00
Gary Russell
2d549f077a INT-2667 JMS Outbound Gateway Documentation
Add reference docs:

- Caution about using cached consumers with a specified reply dest.

- Add <reply-listener/> docs.

INT-2667 Polishing

PR Review Comments
2012-09-20 21:35:16 -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
Oleg Zhurakousky
a013b66af0 INT-2723/24 RedisStore Inbound/Outbound docs
INT-2723 Polishing

Polish docs

Remove #store SpEL variable from the Tx Synchronization.
2012-09-18 16:04:27 +01:00
Gary Russell
40ce2ab793 INT-2695 WS Support URI Schemes Other than http(s)
Previously, only http: or https: URI schemes were supported
by the uri attribute. To use other schemes (such as jms:),
you had to provide a DestinationProvider.

Add support for schemes other than http and https by
creating a DestinationProvider internally when such a
URI is detected.

Note: <uri-variable/>s are NOT supported except when
a URI with an http(s) scheme is provided. An exception
is thrown if variables are provided with an incompatible
URI, or if a DestinationProvider is supplied.

This could break existing applications that provide an
external DestinationProvider and have configured
<uri-variable/>s. Previously, these variables were
simply ignored.
2012-09-18 09:41:18 -04:00
Gary Russell
4b1bb376e5 INT-2699 Reference Docs for Tx Synchronization
- What's new
- Transaction appendix

INT-2699 Change Holder Class Name
2012-09-18 08:26:30 -04:00
Oleg Zhurakousky
64c6d850af INT-2725/26 MongoDb Adapter Docs 2012-09-12 16:01:25 -04:00
Artem Bilan
31d0e42c1a INT-2718 & INT-2721: fixes for <chain> & fix bugs
* ban to use 'channel' and 'request-channel' attributes for 'outbound-channel-adapters' and 'outbound-gateways' when they are declared inside the `<chain>`
* fix usage of `<request-handler-advice-chain>` for components when they are declared inside the `<chain>`
* ban to use `<request-handler-advice-chain>` for 'outbound-channel-adapters' when they are declared inside the `<chain>` don't implement `AbstractReplyProducingMessageHandler`
* refactor `IntegrationNamespaceUtils` to use `BeanDefinition` instead of `BeanDefinitionBuilder` for 'advice-chain' parsing
* tests for new logic for 'channel' and 'request-channel' attributes within `<chain>`
* tests for new logic for `<request-handler-advice-chain>` within `<chain>`
* fix failed test on slow machine
* fix `SysLogTransformer` tests

For reference:
https://jira.springsource.org/browse/INT-2718
https://jira.springsource.org/browse/INT-2721
https://jira.springsource.org/browse/INT-2719

INT-2718 Polishing
2012-09-10 16:13:45 -04:00
Gunnar Hillert
109de2b16a INT-2448 - Document JMS message "selector" attribute
For reference see: https://jira.springsource.org/browse/INT-2448

INT-2448 - Code review changes
2012-09-07 11:34:59 -04:00
Gary Russell
8d887df44f INT-2698 Reference Docs for Handler Advice
INT-2698 Doc Retry Initial Commit

INT-2698 Doc Circuit Breaker

INT-2698 EERHA

INT-2698 Custom Advice

INT-2698 Polishing

INT-2698 Polishing (PR Review)
2012-09-07 10:18:14 -04:00
Gary Russell
d28fefc884 INT-2487 Object Name Patterns for Notifications
Permit the specification of an ObjectName pattern in
NotificationListeningMessageProducer.

Permit a collection of ObjectNames (patterns).

INT-2487 Polishing

Use varargs and a SpEL Reference instead of 2 setters.

Log an error if no MBeans matching pattern(s).

INT-2487 Polishing: PR Review Comments

Add patterns to ERROR log when no MBean(s) found.

Add doc to schema and reference.
2012-09-07 08:07:36 -04:00
Gary Russell
f42201625a INT-2701 Document JEE TaskSchduler Override
Explain how to override the default 'taskScheduler' with a
TimerManagerTaskScheduler.
2012-09-05 11:55:56 -04:00
Gunnar Hillert
dad4eac9ac INT-2710 - Remove hard-coded schema references
For reference see: https://jira.springsource.org/browse/INT-2710
2012-08-28 17:08:43 -04:00
Artem Bilan
600a347652 INT-2722: Document Delayer's <advice-chain>
* describe delayer's `<transactional>` & `<advice-chain>` abilities
* polishing delayer's doc: it looks bad in the PDF
* fix typo for 'proxying'

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

INT-2722: Polishing - PR comments
2012-08-28 16:59:47 -04:00
Gunnar Hillert
f37aa9db81 INT-2292 - Document usage of default namespaces for XPath Expressions
For reference see: https://jira.springsource.org/browse/INT-2292
2012-08-10 07:51:24 -04:00
Gunnar Hillert
17dd49beb4 INT-2670 -JMS Samples Chapter uses old Repo URL 2012-08-09 12:24:00 -04:00
Gunnar Hillert
6b4f67b153 INT-2668 - Improve the File Overwrite Handling
* Add *mode* attribute to XSD (supports APPEND, FAIL, IGNORE, REPLACE)
* Add test cases
* Add reference documentation

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

INT-2668 - Code Review Changes

INT-2688 fixed typo
2012-08-01 13:32:54 -04:00
Artem Bilan
09c92cf04d INT-2678: fix a couple of typo
* changes-2.0-2.1.xml: the subject of INT-2678
* delayer.xml <classname> tag typo
2012-07-19 11:29:19 +03:00
Gunnar Hillert
b07abcd30c INT-2262 - Add reply-timeout to Outbound Gateways
For reference see: https://jira.springsource.org/browse/INT-2262

Add reply-timeout attribute to:

* Amqp Outbound Gateway
* File Outbound Gateway
* Ftp Outbound Gateway
* Sftp Outbound Gateway
* Ws Outbound Gateway

Update Schema Documentation for reply-timeout attribute:

* spring-integration-jpa-2.2.xsd
* spring-integration-jms-2.2.xsd
* spring-integration-jdbc-2.2.xsd
* spring-integration-ip-2.2.xsd
* spring-integration-http-2.2.xsd

Update the *What's new in Spring Integration 2.2* section in the reference manual

INT-2262 - Code Review

* Update copyright year for affected files
* Update author tags for affected files
2012-07-16 14:37:16 -04:00
Gunnar Hillert
0d81837e1b INT-2574 Document "max-rows-per-poll" vs "max-messages-per-poll"
For reference see: https://jira.springsource.org/browse/INT-2574
2012-07-16 10:37:24 -04:00
Gunnar Hillert
2877776823 INT-2473 - Update Doc for Xslt Transformers
INT-2473 Document XSD for xslt-transformer

* convert spaces to tabs in XsltPayloadTransformerParser
* Add JavaDoc to ResultTransformer

INT-2473 - Code/Doc Review

* Add documentation for *SourceFactories*
* Add links
* Rephrase section on *ResultTransformers*

Minor polish
2012-07-06 15:57:30 -04:00
Gunnar Hillert
bc244eff8f INT-2289 - Make update optional for JDBC Outbound Gateway
For reference: https://jira.springsource.org/browse/INT-2289
2012-06-28 20:04:22 -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
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
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
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
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
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
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
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
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
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
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
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
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
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